upd + rebuild

uhulinux · Mar 17, 2016 · b883eaf · b883eaf
1 parent cd7c87f
commit b883eaf
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 76 deletions.
diff --git a/7zip/maintainer b/7zip/maintainer
@@ -1 +1 @@
-Kiss Attila <[email protected]>
+UBK <[email protected]>
diff --git a/7zip/patches/01-destdir.patch b/7zip/patches/01-destdir.patch
@@ -1,6 +1,6 @@
-diff -Naur orig/install.sh patched/install.sh
---- orig/install.sh	2015-10-05 10:38:59.000000000 +0200
-+++ patched/install.sh	2015-10-31 04:44:15.479208146 +0100
+diff -Naur p7zip_15.14-orig/install.sh p7zip_15.14/install.sh
+--- p7zip_15.14-orig/install.sh	2015-10-05 10:39:00.000000000 +0200
++++ p7zip_15.14/install.sh	2016-03-17 20:05:20.470454202 +0100
 @@ -16,14 +16,14 @@
  }
 
@@ -19,10 +19,10 @@ diff -Naur orig/install.sh patched/install.sh
  [ "$1" ] && DEST_BIN="$1"
  [ "$2" ] && DEST_SHARE="$2"
  [ "$3" ] && DEST_MAN="$3"
-diff -Naur orig/makefile patched/makefile
---- orig/makefile	2015-10-05 10:39:57.000000000 +0200
-+++ patched/makefile	2015-10-31 04:46:09.951775785 +0100
-@@ -1,10 +1,11 @@
+diff -Naur p7zip_15.14-orig/makefile.common p7zip_15.14/makefile.common
+--- p7zip_15.14-orig/makefile.common	2016-03-10 06:37:09.000000000 +0100
++++ p7zip_15.14/makefile.common	2016-03-17 20:09:56.398454660 +0100
+@@ -1,10 +1,10 @@
  MKDIR = mkdir -p
 
 -DEST_HOME=/usr/local
@@ -32,7 +32,6 @@ diff -Naur orig/makefile patched/makefile
  DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip
 -DEST_MAN=$(DEST_HOME)/man
 +DEST_MAN=$(DEST_HOME)/share/man
-+DEST_DIR=$(DESTDIR)
 
- .PHONY: default all all2 7za 7zG 7zFM sfx 7z 7zr Client7z common common7z LangAndHelp clean tar_bin depend test test_7z test_7zr test_7zG test_Client7z LzmaCon test_LzmaCon  all_test app cppcheck
+ .PHONY: default all all2 7za 7zG 7zFM sfx 7z 7zr Client7z common common7z LangAndHelp tar_bin depend test test_7z test_7zr test_7zG test_Client7z LzmaCon test_LzmaCon  all_test app cppcheck lzham test_lib other
 
diff --git a/7zip/version b/7zip/version
@@ -1 +1 @@
-15.09
+15.14
diff --git a/openssl/version b/openssl/version
@@ -1 +1 @@
-1.0.2f
+1.0.2g
diff --git a/pbzip2/patches/destdir.patch b/pbzip2/patches/destdir.patch
diff --git a/pbzip2/patches/destdir.patch.skip.skip b/pbzip2/patches/destdir.patch.skip.skip
diff --git a/pbzip2/patches/man_dir.patch b/pbzip2/patches/man_dir.patch
diff --git a/pbzip2/patches/man_dir.patch.skip b/pbzip2/patches/man_dir.patch.skip
diff --git a/perl-xml-parser/acquire b/perl-xml-parser/acquire
@@ -2,3 +2,4 @@
 
 XML-Parser-$UB_VERSION.tar.gz XML-Parser-$UB_VERSION/
 	ftp://ftp.cpan.org/pub/CPAN/modules/by-module/XML/
+	http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Kiss Attila <[email protected]>
		UBK <[email protected]>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		XML-Parser-$UB_VERSION.tar.gz XML-Parser-$UB_VERSION/
		ftp://ftp.cpan.org/pub/CPAN/modules/by-module/XML/
		http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/