[arch-commits] Commit in proxychains-ng/repos (8 files)
Felix Yan
fyan at archlinux.org
Sun Jun 7 14:51:48 UTC 2015
Date: Sunday, June 7, 2015 @ 16:51:48
Author: fyan
Revision: 134950
archrelease: copy trunk to community-i686, community-x86_64
Added:
proxychains-ng/repos/community-i686/PKGBUILD
(from rev 134949, proxychains-ng/trunk/PKGBUILD)
proxychains-ng/repos/community-i686/revert-fix-ldflags.patch
(from rev 134949, proxychains-ng/trunk/revert-fix-ldflags.patch)
proxychains-ng/repos/community-i686/revert-fix-makefile-link-order.patch
(from rev 134949, proxychains-ng/trunk/revert-fix-makefile-link-order.patch)
proxychains-ng/repos/community-x86_64/PKGBUILD
(from rev 134949, proxychains-ng/trunk/PKGBUILD)
proxychains-ng/repos/community-x86_64/revert-fix-ldflags.patch
(from rev 134949, proxychains-ng/trunk/revert-fix-ldflags.patch)
proxychains-ng/repos/community-x86_64/revert-fix-makefile-link-order.patch
(from rev 134949, proxychains-ng/trunk/revert-fix-makefile-link-order.patch)
Deleted:
proxychains-ng/repos/community-i686/PKGBUILD
proxychains-ng/repos/community-x86_64/PKGBUILD
-------------------------------------------------------+
/PKGBUILD | 88 ++++++++++++++++
community-i686/PKGBUILD | 33 ------
community-i686/revert-fix-ldflags.patch | 59 ++++++++++
community-i686/revert-fix-makefile-link-order.patch | 26 ++++
community-x86_64/PKGBUILD | 33 ------
community-x86_64/revert-fix-ldflags.patch | 59 ++++++++++
community-x86_64/revert-fix-makefile-link-order.patch | 26 ++++
7 files changed, 258 insertions(+), 66 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-06-07 14:51:24 UTC (rev 134949)
+++ community-i686/PKGBUILD 2015-06-07 14:51:48 UTC (rev 134950)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Cedric Girard <girard.cedric at gmail.com>
-
-pkgname=proxychains-ng
-pkgver=4.9
-pkgrel=1
-pkgdesc="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies"
-arch=('i686' 'x86_64')
-url="https://github.com/rofl0r/proxychains"
-license=('GPL')
-provides=('proxychains')
-replaces=('proxychains')
-conflicts=('proxychains')
-depends=('glibc')
-backup=('etc/proxychains.conf')
-source=("http://downloads.sourceforge.net/project/$pkgname/proxychains-$pkgver.tar.bz2")
-md5sums=('96d2ad3eaeec5a7c001a19fb2d819c80')
-
-build() {
- cd proxychains-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd proxychains-$pkgver
- make DESTDIR="$pkgdir/" install
- make DESTDIR="$pkgdir/" install-config
- ln -s proxychains4 "$pkgdir/usr/bin/proxychains"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: proxychains-ng/repos/community-i686/PKGBUILD (from rev 134949, proxychains-ng/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Cedric Girard <girard.cedric at gmail.com>
+
+pkgname=proxychains-ng
+pkgver=4.9
+pkgrel=2
+pkgdesc="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies"
+arch=('i686' 'x86_64')
+url="https://github.com/rofl0r/proxychains"
+license=('GPL')
+provides=('proxychains')
+replaces=('proxychains')
+conflicts=('proxychains')
+depends=('glibc')
+backup=('etc/proxychains.conf')
+source=("http://downloads.sourceforge.net/project/$pkgname/proxychains-$pkgver.tar.bz2"
+ revert-fix-makefile-link-order.patch
+ revert-fix-ldflags.patch)
+md5sums=('96d2ad3eaeec5a7c001a19fb2d819c80'
+ 'a75cb1a67936660b7b7f3a911440a431'
+ '727032cfa2665887460e48ae8e6a5700')
+
+prepare() {
+ cd proxychains-$pkgver
+ # https://github.com/rofl0r/proxychains-ng/issues/53
+ patch -p1 -i ../revert-fix-makefile-link-order.patch
+ patch -p1 -i ../revert-fix-ldflags.patch
+}
+
+build() {
+ cd proxychains-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd proxychains-$pkgver
+ make DESTDIR="$pkgdir/" install
+ make DESTDIR="$pkgdir/" install-config
+ ln -s proxychains4 "$pkgdir/usr/bin/proxychains"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: proxychains-ng/repos/community-i686/revert-fix-ldflags.patch (from rev 134949, proxychains-ng/trunk/revert-fix-ldflags.patch)
===================================================================
--- community-i686/revert-fix-ldflags.patch (rev 0)
+++ community-i686/revert-fix-ldflags.patch 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,59 @@
+From c9c51d6705cad9ee228a54d028521504e5cd505a Mon Sep 17 00:00:00 2001
+From: rofl0r <retnyg at gmx.net>
+Date: Thu, 4 Jun 2015 21:04:30 +0100
+Subject: [PATCH] Revert "Fix LDFLAGS"
+
+This reverts commit e79e05a228558e95ee2d3e7cfffd9bbe1e4a368e.
+
+This commit broke link order for a number of people.
+---
+ Makefile | 7 +++----
+ configure | 1 -
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 58800f3..0ebfa17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,7 +25,7 @@ GENH = src/version.h
+ CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+ NO_AS_NEEDED = -Wl,--no-as-needed
+ LIBDL = -ldl
+-LDFLAGS = -fPIC $(NO_AS_NEEDED)
++LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
+ INC =
+ PIC = -fPIC
+ AR = $(CROSS_COMPILE)ar
+@@ -46,7 +46,6 @@ ALL_CONFIGS = src/proxychains.conf
+ -include config.mak
+
+ CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
+-LDFLAGS+=$(USER_LDFLAGS)
+ CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
+
+
+@@ -82,10 +81,10 @@ src/version.o: src/version.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+
+ $(LDSO_PATHNAME): $(LOBJS)
+- $(CC) -shared -lpthread $(LIBDL) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
++ $(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
+
+ $(ALL_TOOLS): $(OBJS)
+- $(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
++ $(CC) src/main.o src/common.o -o $(PXCHAINS)
+
+
+ .PHONY: all clean install install-config install-libs install-tools
+diff --git a/configure b/configure
+index a4dac46..2127287 100755
+--- a/configure
++++ b/configure
+@@ -92,7 +92,6 @@ fi
+ echo CC?=$CC>config.mak
+ [ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak
+ [ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak
+-[ -z "$LDFLAGS" ] || echo USER_LDFLAGS?=$LDFLAGS>>config.mak
+ echo prefix=$prefix>>config.mak
+ echo exec_prefix=$exec_prefix>>config.mak
+ echo bindir=$bindir>>config.mak
Copied: proxychains-ng/repos/community-i686/revert-fix-makefile-link-order.patch (from rev 134949, proxychains-ng/trunk/revert-fix-makefile-link-order.patch)
===================================================================
--- community-i686/revert-fix-makefile-link-order.patch (rev 0)
+++ community-i686/revert-fix-makefile-link-order.patch 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,26 @@
+From fda4ba37ece7c9c24602581a13c7c64db158dfa7 Mon Sep 17 00:00:00 2001
+From: rofl0r <retnyg at gmx.net>
+Date: Thu, 4 Jun 2015 21:03:25 +0100
+Subject: [PATCH] Revert "fix makefile link order"
+
+This reverts commit 377b474b40bb34fde018301294e02850dac928fe.
+
+There still are problems with the link order.
+Revert to the known-good version.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 52c6a88..58800f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,7 +82,7 @@ src/version.o: src/version.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+
+ $(LDSO_PATHNAME): $(LOBJS)
+- $(CC) -shared $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -lpthread $(LIBDL) -o $@ $(LOBJS)
++ $(CC) -shared -lpthread $(LIBDL) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
+
+ $(ALL_TOOLS): $(OBJS)
+ $(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-06-07 14:51:24 UTC (rev 134949)
+++ community-x86_64/PKGBUILD 2015-06-07 14:51:48 UTC (rev 134950)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Cedric Girard <girard.cedric at gmail.com>
-
-pkgname=proxychains-ng
-pkgver=4.9
-pkgrel=1
-pkgdesc="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies"
-arch=('i686' 'x86_64')
-url="https://github.com/rofl0r/proxychains"
-license=('GPL')
-provides=('proxychains')
-replaces=('proxychains')
-conflicts=('proxychains')
-depends=('glibc')
-backup=('etc/proxychains.conf')
-source=("http://downloads.sourceforge.net/project/$pkgname/proxychains-$pkgver.tar.bz2")
-md5sums=('96d2ad3eaeec5a7c001a19fb2d819c80')
-
-build() {
- cd proxychains-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd proxychains-$pkgver
- make DESTDIR="$pkgdir/" install
- make DESTDIR="$pkgdir/" install-config
- ln -s proxychains4 "$pkgdir/usr/bin/proxychains"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: proxychains-ng/repos/community-x86_64/PKGBUILD (from rev 134949, proxychains-ng/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Cedric Girard <girard.cedric at gmail.com>
+
+pkgname=proxychains-ng
+pkgver=4.9
+pkgrel=2
+pkgdesc="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies"
+arch=('i686' 'x86_64')
+url="https://github.com/rofl0r/proxychains"
+license=('GPL')
+provides=('proxychains')
+replaces=('proxychains')
+conflicts=('proxychains')
+depends=('glibc')
+backup=('etc/proxychains.conf')
+source=("http://downloads.sourceforge.net/project/$pkgname/proxychains-$pkgver.tar.bz2"
+ revert-fix-makefile-link-order.patch
+ revert-fix-ldflags.patch)
+md5sums=('96d2ad3eaeec5a7c001a19fb2d819c80'
+ 'a75cb1a67936660b7b7f3a911440a431'
+ '727032cfa2665887460e48ae8e6a5700')
+
+prepare() {
+ cd proxychains-$pkgver
+ # https://github.com/rofl0r/proxychains-ng/issues/53
+ patch -p1 -i ../revert-fix-makefile-link-order.patch
+ patch -p1 -i ../revert-fix-ldflags.patch
+}
+
+build() {
+ cd proxychains-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd proxychains-$pkgver
+ make DESTDIR="$pkgdir/" install
+ make DESTDIR="$pkgdir/" install-config
+ ln -s proxychains4 "$pkgdir/usr/bin/proxychains"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: proxychains-ng/repos/community-x86_64/revert-fix-ldflags.patch (from rev 134949, proxychains-ng/trunk/revert-fix-ldflags.patch)
===================================================================
--- community-x86_64/revert-fix-ldflags.patch (rev 0)
+++ community-x86_64/revert-fix-ldflags.patch 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,59 @@
+From c9c51d6705cad9ee228a54d028521504e5cd505a Mon Sep 17 00:00:00 2001
+From: rofl0r <retnyg at gmx.net>
+Date: Thu, 4 Jun 2015 21:04:30 +0100
+Subject: [PATCH] Revert "Fix LDFLAGS"
+
+This reverts commit e79e05a228558e95ee2d3e7cfffd9bbe1e4a368e.
+
+This commit broke link order for a number of people.
+---
+ Makefile | 7 +++----
+ configure | 1 -
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 58800f3..0ebfa17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,7 +25,7 @@ GENH = src/version.h
+ CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+ NO_AS_NEEDED = -Wl,--no-as-needed
+ LIBDL = -ldl
+-LDFLAGS = -fPIC $(NO_AS_NEEDED)
++LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
+ INC =
+ PIC = -fPIC
+ AR = $(CROSS_COMPILE)ar
+@@ -46,7 +46,6 @@ ALL_CONFIGS = src/proxychains.conf
+ -include config.mak
+
+ CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
+-LDFLAGS+=$(USER_LDFLAGS)
+ CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
+
+
+@@ -82,10 +81,10 @@ src/version.o: src/version.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+
+ $(LDSO_PATHNAME): $(LOBJS)
+- $(CC) -shared -lpthread $(LIBDL) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
++ $(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
+
+ $(ALL_TOOLS): $(OBJS)
+- $(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
++ $(CC) src/main.o src/common.o -o $(PXCHAINS)
+
+
+ .PHONY: all clean install install-config install-libs install-tools
+diff --git a/configure b/configure
+index a4dac46..2127287 100755
+--- a/configure
++++ b/configure
+@@ -92,7 +92,6 @@ fi
+ echo CC?=$CC>config.mak
+ [ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak
+ [ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak
+-[ -z "$LDFLAGS" ] || echo USER_LDFLAGS?=$LDFLAGS>>config.mak
+ echo prefix=$prefix>>config.mak
+ echo exec_prefix=$exec_prefix>>config.mak
+ echo bindir=$bindir>>config.mak
Copied: proxychains-ng/repos/community-x86_64/revert-fix-makefile-link-order.patch (from rev 134949, proxychains-ng/trunk/revert-fix-makefile-link-order.patch)
===================================================================
--- community-x86_64/revert-fix-makefile-link-order.patch (rev 0)
+++ community-x86_64/revert-fix-makefile-link-order.patch 2015-06-07 14:51:48 UTC (rev 134950)
@@ -0,0 +1,26 @@
+From fda4ba37ece7c9c24602581a13c7c64db158dfa7 Mon Sep 17 00:00:00 2001
+From: rofl0r <retnyg at gmx.net>
+Date: Thu, 4 Jun 2015 21:03:25 +0100
+Subject: [PATCH] Revert "fix makefile link order"
+
+This reverts commit 377b474b40bb34fde018301294e02850dac928fe.
+
+There still are problems with the link order.
+Revert to the known-good version.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 52c6a88..58800f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,7 +82,7 @@ src/version.o: src/version.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+
+ $(LDSO_PATHNAME): $(LOBJS)
+- $(CC) -shared $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -lpthread $(LIBDL) -o $@ $(LOBJS)
++ $(CC) -shared -lpthread $(LIBDL) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
+
+ $(ALL_TOOLS): $(OBJS)
+ $(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
More information about the arch-commits
mailing list