afflib-3.7.15 (WIP)

fd00 · Jan 7, 2017 · a5012d6 · a5012d6
1 parent 4caf373
commit a5012d6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 48 deletions.
diff --git a/afflib/README b/afflib/README
@@ -4,18 +4,17 @@ AFF Library and Toolkit is a set of programs for working with computer
 forensic information.
 
 Runtime requirements:
-  cygwin-2.6.0-1
-  libafflib-devel-3.7.13-1bl1
-  libafflib0-3.7.13-1bl1
-  libcurl4-7.51.0-1
+  cygwin-2.6.1-1
+  libafflib-devel-3.7.15-1bl1
+  libafflib0-3.7.15-1bl1
+  libcurl4-7.52.1-1
   libexpat1-2.2.0-0
   libgcc1-5.4.0-1
   libopenssl100-1.0.2j-1
-  libreadline7-6.3.8-1
+  libreadline7-7.0.1-1
   libstdc++6-5.4.0-1
   openssl-devel-1.0.2j-1
   pkg-config-0.29.1-1
-  python-2.7.12-1
   zlib0-1.2.8-3
 
 Build requirements:
@@ -28,28 +27,28 @@ Build requirements:
   gcc-g++-5.4.0-1
   libtool-2.4.6-4
   make-4.2.1-1
+  python-2.7.12-1
 
 Canonical website:
   https://github.com/sshock/AFFLIBv3
 
 Canonical download:
-  https://github.com/sshock/AFFLIBv3/archive/v3.7.13.tar.gz
+  https://github.com/sshock/AFFLIBv3/archive/v3.7.15.tar.gz
 
 -------------------------------------------
 
 Build instructions:
-  1. unpack afflib-3.7.13-X-src.tar.xz
+  1. unpack afflib-3.7.15-X-src.tar.xz
   2. if you use setup to install this src package,
      it will be unpacked under /usr/src automatically
         % cd /usr/src
-        % cygport ./afflib-3.7.13-X.cygport all
+        % cygport ./afflib-3.7.15-X.cygport all
 
 This will create:
-  /usr/src/afflib-3.7.13-X-src.tar.xz
-  /usr/src/afflib-3.7.13-X.tar.xz
-  /usr/src/libafflib0-3.7.13-X.tar.xz
-  /usr/src/libafflib-devel-3.7.13-X.tar.xz
-  /usr/src/python-afflib-3.7.13-X.tar.xz
+  /usr/src/afflib-3.7.15-X-src.tar.xz
+  /usr/src/afflib-3.7.15-X.tar.xz
+  /usr/src/libafflib0-3.7.15-X.tar.xz
+  /usr/src/libafflib-devel-3.7.15-X.tar.xz
 
 -------------------------------------------
 
@@ -121,13 +120,13 @@ Files included in the binary package:
   /usr/lib/libafflib.dll.a
   /usr/lib/pkgconfig/afflib.pc
 
-(python-afflib)
-  /usr/lib/python2.7/site-packages/pyaff.dll
-
 ------------------
 
 Port Notes:
 
+----- version 3.7.15-1bl1 -----
+Version bump.
+
 ----- version 3.7.13-1bl1 -----
 Version bump.
 

diff --git a/afflib/afflib-3.7.13-1bl1.cygport → afflib/afflib-3.7.15-1bl1.cygport b/afflib/afflib-3.7.13-1bl1.cygport → afflib/afflib-3.7.15-1bl1.cygport
@@ -23,7 +23,6 @@ PKG_NAMES="
 	${PN}
 	lib${PN}0
 	lib${PN}-devel
-	python-${PN}
 "
 afflib_CONTENTS="
 	usr/bin/*.exe
@@ -37,10 +36,6 @@ libafflib_devel_CONTENTS="
 	usr/lib/lib${PN}*
 	usr/lib/pkgconfig
 "
-python_afflib_CONTENTS="
-	usr/lib/python*
-"
 afflib_SUMMARY="${SUMMARY} (utilities)"
 libafflib0_SUMMARY="${SUMMARY} (runtime)"
 libafflib_devel_SUMMARY="${SUMMARY} (development)"
-python_afflib_SUMMARY="${SUMMARY} (python bindings)"
diff --git a/afflib/afflib-3.7.13-1bl1.src.patch → afflib/afflib-3.7.15-1bl1.src.patch b/afflib/afflib-3.7.13-1bl1.src.patch → afflib/afflib-3.7.15-1bl1.src.patch
@@ -1,5 +1,5 @@
---- origsrc/AFFLIBv3-3.7.13/lib/Makefile.am	2016-11-27 02:55:46.000000000 +0900
-+++ src/AFFLIBv3-3.7.13/lib/Makefile.am	2016-12-02 12:46:39.977309500 +0900
+--- origsrc/AFFLIBv3-3.7.15/lib/Makefile.am	2016-12-31 15:01:16.000000000 +0900
++++ src/AFFLIBv3-3.7.15/lib/Makefile.am	2017-01-08 00:39:23.356070200 +0900
 @@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
  aftest_SOURCES = aftest.cpp
@@ -9,14 +9,8 @@
 
  AFFLIB_SOURCES = aff_db.cpp aff_db.h aff_toc.cpp \
  	afflib.cpp afflib.h afflib_i.h afflib_os.cpp \
-@@ -85,30 +85,30 @@ install-exec-hook:
- EXTRA_DIST = 
-
- AM_CPPFLAGS =  \
--	-I@top_srcdir@/lzma443/C  \
--	-I@top_srcdir@/lzma443/C/7zip/Compress/LZMA_Alone  
-+	-I${top_srcdir}/lzma443/C  \
-+	-I${top_srcdir}/lzma443/C/7zip/Compress/LZMA_Alone  
+@@ -90,26 +90,26 @@ AM_CPPFLAGS =  \
+ 	-I@top_srcdir@/include/afflib
 
  LZMA_SOURCES =  \
 -	@top_srcdir@/lzma443/C/7zip/Compress/LZMA_Alone/LzmaBench.cpp \
@@ -58,29 +52,17 @@
 +	../lzma443/C/Common/String.cpp \
 +	../lzma443/C/Common/StringConvert.cpp \
 +	../lzma443/C/Common/StringToInt.cpp \
-+	../lzma443/C/Common/Vector.cpp 
++	../lzma443/C/Common/Vector.cpp
 
 
  # specify lib_ to force tools to be dynamically linked against the installed library. 
-@@ -116,3 +116,4 @@ LZMA_SOURCES =  \
+@@ -117,3 +117,4 @@ LZMA_SOURCES =  \
  # Unfortunately, when we specify lib_, things don't build. I can't figure it out.
  lib_LTLIBRARIES = libafflib.la
  libafflib_la_SOURCES += $(LZMA_SOURCES)
 +libafflib_la_LDFLAGS = -no-undefined
---- origsrc/AFFLIBv3-3.7.13/pyaff/Makefile.am	2016-11-27 02:55:46.000000000 +0900
-+++ src/AFFLIBv3-3.7.13/pyaff/Makefile.am	2016-12-02 12:46:39.982358800 +0900
-@@ -9,7 +9,7 @@ pyexec_LTLIBRARIES 	= pyaff.la
-
- pyaff_la_SOURCES	= pyaff.c
- pyaff_la_LIBADD		= ../lib/libafflib.la
--pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
-+pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS) -I$(top_srcdir)
- pyaff_la_CFLAGS                = -fno-strict-aliasing
--pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
-+pyaff_la_LDFLAGS 	= -no-undefined -module -avoid-version $(PYTHON_LDFLAGS)
- endif
---- origsrc/AFFLIBv3-3.7.13/tools/affcopy.cpp	2016-11-27 02:55:46.000000000 +0900
-+++ src/AFFLIBv3-3.7.13/tools/affcopy.cpp	2016-12-02 12:46:39.990189700 +0900
+--- origsrc/AFFLIBv3-3.7.15/tools/affcopy.cpp	2016-12-31 15:01:16.000000000 +0900
++++ src/AFFLIBv3-3.7.15/tools/affcopy.cpp	2017-01-08 00:42:40.146385100 +0900
 @@ -146,7 +146,7 @@ void unlink_outfiles(vector<string> outf
      if(failure) exit(1);
  }
@@ -90,3 +72,9 @@
  #define isnumber(x) isdigit(x)
  #endif
 
+@@ -665,5 +665,3 @@ int main(int argc,char **argv)
+     }
+     exit(0);
+ }
+-
+-