Date: Sat, 31 Jul 2004 09:53:01 +0200 (CEST) From: Patrick MARIE <mycroft@virgaria.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69838: net/proxychains: update to 2.1 Message-ID: <200407310753.i6V7r1Sf084574@amethyst.in.virgaria.org> Resent-Message-ID: <200407310750.i6V7oQBU082988@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69838
>Category: ports
>Synopsis: net/proxychains: update to 2.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 31 07:50:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Patrick MARIE
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
epplug.org
>Environment:
System: FreeBSD amethyst.in.virgaria.org 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Fri Jul 23 18:38:35 CEST 2004 root@amethyst.in.virgaria.org:/usr/obj/usr/src/sys/amethyst i386
>Description:
- Update to 2.1
>How-To-Repeat:
>Fix:
--- proxychains21.patch begins here ---
diff -x CVS -ruN /usr/ports/net/proxychains/Makefile proxychains/Makefile
--- /usr/ports/net/proxychains/Makefile Fri Oct 10 07:37:57 2003
+++ proxychains/Makefile Thu Jun 24 15:55:06 2004
@@ -4,7 +4,7 @@
# $FreeBSD: ports/net/proxychains/Makefile,v 1.1 2003/10/10 05:37:57 edwin Exp $
PORTNAME= proxychains
-PORTVERSION= 1.8.2
+PORTVERSION= 2.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= proxychains
@@ -12,20 +12,25 @@
MAINTAINER= mycroft@virgaria.org
COMMENT= Multi-proxifier
-GNU_CONFIGURE= yes
USE_REINPLACE= yes
+USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 14
+
INSTALLS_SHLIB= yes
post-extract:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/proxychains/Makefile.in
+pre-build:
+ ${RM} ${WRKSRC}/config.h
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/proxychains/proxychains ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/proxychains/proxychains.conf \
${PREFIX}/etc
- ${INSTALL_DATA} ${WRKSRC}/proxychains/.libs/libproxychains.so.9 \
+ ${INSTALL_DATA} ${WRKSRC}/proxychains/.libs/libproxychains.so.2 \
${PREFIX}/lib
.include <bsd.port.mk>
diff -x CVS -ruN /usr/ports/net/proxychains/distinfo proxychains/distinfo
--- /usr/ports/net/proxychains/distinfo Sun Mar 21 09:55:11 2004
+++ proxychains/distinfo Thu Jun 24 10:17:38 2004
@@ -1,2 +1,2 @@
-MD5 (proxychains-1.8.2.tar.gz) = 276ad24c2680010a96f5e027ea27dcee
-SIZE (proxychains-1.8.2.tar.gz) = 185357
+MD5 (proxychains-2.1.tar.gz) = 5f54d41265a20ae48c261a53ca603139
+SIZE (proxychains-2.1.tar.gz) = 181095
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-::acconfig.h proxychains/files/patch-::acconfig.h
--- /usr/ports/net/proxychains/files/patch-::acconfig.h Thu Jan 1 01:00:00 1970
+++ proxychains/files/patch-::acconfig.h Thu Jun 24 12:07:40 2004
@@ -0,0 +1,8 @@
+--- acconfig.h.orig Thu Jun 24 12:07:12 2004
++++ acconfig.h Thu Jun 24 12:07:20 2004
+@@ -7,3 +7,5 @@
+
+ /* Define if you need the GNU extensions to compile */
+ #undef _GNU_SOURCE
++
++#undef PREFIX_DIR
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-::config.h.in proxychains/files/patch-::config.h.in
--- /usr/ports/net/proxychains/files/patch-::config.h.in Fri Oct 10 07:37:58 2003
+++ proxychains/files/patch-::config.h.in Thu Jan 1 01:00:00 1970
@@ -1,9 +0,0 @@
---- config.h.in.old Sat Jun 14 15:08:43 2003
-+++ config.h.in Sat Jun 14 15:09:24 2003
-@@ -6,3 +6,6 @@
- /* Version number of package */
- #undef VERSION
-
-+/* PREFIX needed for libproxychains.c */
-+#undef PREFIX
-+
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-::configure proxychains/files/patch-::configure
--- /usr/ports/net/proxychains/files/patch-::configure Fri Oct 10 07:37:58 2003
+++ proxychains/files/patch-::configure Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
---- configure.old Sat Jun 14 15:08:33 2003
-+++ configure Sat Jun 14 15:09:49 2003
-@@ -807,6 +807,8 @@
-
- VERSION=1.8.2
-
-+PREFIX=$prefix
-+
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
- fi
-@@ -816,6 +818,10 @@
-
- cat >> confdefs.h <<EOF
- #define VERSION "$VERSION"
-+EOF
-+
-+cat >> confdefs.h <<EOF
-+#define PREFIX "$PREFIX"
- EOF
-
-
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-::configure.in proxychains/files/patch-::configure.in
--- /usr/ports/net/proxychains/files/patch-::configure.in Thu Jan 1 01:00:00 1970
+++ proxychains/files/patch-::configure.in Thu Jun 24 14:56:44 2004
@@ -0,0 +1,18 @@
+--- configure.in.orig Fri May 7 11:34:58 2004
++++ configure.in Thu Jun 24 14:56:30 2004
+@@ -12,11 +12,14 @@
+
+ AM_INIT_AUTOMAKE(proxychains,2.1)
+
+-AC_PREFIX_DEFAULT(/usr)
++AC_PREFIX_DEFAULT(/usr/local)
+ if test "x$prefix" = "xNONE"; then
+ prefix=$ac_default_prefix
+ ac_configure_args="$ac_configure_args --prefix $prefix"
++else
++ prefix=$prefix
+ fi
++AC_DEFINE_UNQUOTED(PREFIX_DIR, "${prefix}")
+
+ dnl without this order in this file, automake will be confused!
+ dnl
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-proxychains::libproxychains.c proxychains/files/patch-proxychains::libproxychains.c
--- /usr/ports/net/proxychains/files/patch-proxychains::libproxychains.c Fri Oct 10 07:37:58 2003
+++ proxychains/files/patch-proxychains::libproxychains.c Thu Jun 24 12:26:42 2004
@@ -1,22 +1,11 @@
---- proxychains/libproxychains.c.orig Wed Jun 4 11:11:03 2003
-+++ proxychains/libproxychains.c Sat Jun 14 15:17:55 2003
-@@ -14,6 +14,10 @@
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -72,7 +76,7 @@
+--- proxychains/libproxychains.c.orig Fri May 7 11:34:59 2004
++++ proxychains/libproxychains.c Thu Jun 24 10:54:27 2004
+@@ -73,7 +73,7 @@
if(!(file=fopen("./proxychains.conf","r")))
if(!(file=fopen(buff,"r")))
- if(!(file=fopen("/etc/proxychains.conf","r")))
-+ if(!(file=fopen(PREFIX "/etc/proxychains.conf","r")))
++ if(!(file=fopen(PREFIX_DIR "/etc/proxychains.conf","r")))
{
- perror("1");
+ perror("Can't locate proxychains.conf");
exit(1);
diff -x CVS -ruN /usr/ports/net/proxychains/files/patch-proxychains::main.c proxychains/files/patch-proxychains::main.c
--- /usr/ports/net/proxychains/files/patch-proxychains::main.c Thu Jan 1 01:00:00 1970
+++ proxychains/files/patch-proxychains::main.c Thu Jun 24 13:22:24 2004
@@ -0,0 +1,11 @@
+--- proxychains/main.c.orig Thu Jun 24 13:13:46 2004
++++ proxychains/main.c Thu Jun 24 13:14:05 2004
+@@ -41,7 +41,7 @@
+ "More help in README file\n");
+ return 0 ;
+ }
+- putenv("LD_PRELOAD=/usr/lib/libproxychains.so");
++ putenv("LD_PRELOAD=" PREFIX_DIR "/lib/libproxychains.so.2");
+ execvp(argv[1],&argv[1]);
+ perror("proxychains can't load process....");
+ return EXIT_SUCCESS;
diff -x CVS -ruN /usr/ports/net/proxychains/pkg-plist proxychains/pkg-plist
--- /usr/ports/net/proxychains/pkg-plist Fri Oct 10 07:37:57 2003
+++ proxychains/pkg-plist Thu Jun 24 12:29:28 2004
@@ -1,3 +1,3 @@
bin/proxychains
etc/proxychains.conf
-lib/libproxychains.so.9
+lib/libproxychains.so.2
--- proxychains21.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407310753.i6V7r1Sf084574>