Adding basic proxy auth patch. Closes #11706.

6 files changed, 74 insertions, 74 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 2b4d42f079fd..40861549d4f5 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.25 2003/05/21 15:08:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.26 2003/05/22 22:11:54 mholzer Exp $
+
+*rsync-2.5.6-r2 (23 May 2003)
+
+  23 May 2003; Martin Holzer <mholzer@gentoo.org> rsync-2.5.6-r2.ebuild,
+  files/rsync-gentoo-2.5.1.patch, files/rsync-gentoo-2.5.2.patch:
+  Adding basic proxy auth patch. Closes #11706.
 
   21 May 2003; Jason Wever <weeve@gentoo.org> rsync-2.5.6-r1.ebuild:
   Changed ~sparc keyword to sparc.
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index af254019a751..de1e3ade47e6 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,13 +1,13 @@
-MD5 cdf2e925b00416acdb960051f627d565 ChangeLog 3827
+MD5 1eacb24426ee53b7bd2562bf74a4cac0 ChangeLog 4048
 MD5 4982f6ecae9fb7af47aea44b413bba7d rsync-2.5.5-r1.ebuild 1547
 MD5 e11c18181a98bc69dfc71500d3501476 rsync-2.5.6-r1.ebuild 1585
 MD5 9f30798289b37de2158e3e03de6f39d6 rsync-2.5.6.ebuild 1513
 MD5 52b785e5998dbe08f7e9bee36205c0bc rsync-2.5.6_pre20021105-r1.ebuild 1582
+MD5 90d228509931721ab1ef5685cb14120a rsync-2.5.6-r2.ebuild 1889
 MD5 b5f60d5d90d313856a1cd5fee021aeaa files/digest-rsync-2.5.5-r1 63
 MD5 c16bfdfcd1f0decdc8764d1499cef365 files/digest-rsync-2.5.6 63
 MD5 c16bfdfcd1f0decdc8764d1499cef365 files/digest-rsync-2.5.6-r1 63
 MD5 4e5850344ac1e5f419641b0793e8f186 files/digest-rsync-2.5.6_pre20021105-r1 76
-MD5 ba089efc4718f16fe8679c788b83012d files/rsync-gentoo-2.5.1.patch 1358
-MD5 872285de42e65681b18ff97c87fbf270 files/rsync-gentoo-2.5.2.patch 1010
+MD5 52fb7a892c22531307a060c2d2ba8333 files/digest-rsync-2.5.6-r2 136
 MD5 38f45eaed761df27cfa731ce65763e98 files/rsyncd.conf.d 355
 MD5 b87d68fcfff9eb9ae5cdbea3796693c5 files/rsyncd.init.d 423
diff --git a/net-misc/rsync/files/digest-rsync-2.5.6-r2 b/net-misc/rsync/files/digest-rsync-2.5.6-r2
new file mode 100644
index 000000000000..de97f912b933
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.5.6-r2
@@ -0,0 +1,2 @@
+MD5 ec39fcea433df4d6a3a4e0896c655535 rsync-2.5.6.tar.gz 584678
+MD5 a399e227a18ea3f2eb5aa2b401006d2d rsync-2.5.6-proxy-auth-1.patch 4353
diff --git a/net-misc/rsync/files/rsync-gentoo-2.5.1.patch b/net-misc/rsync/files/rsync-gentoo-2.5.1.patch
deleted file mode 100644
index c0b1590485c2..000000000000
--- a/net-misc/rsync/files/rsync-gentoo-2.5.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN rsync-2.5.1/flist.c rsync-2.5.1-fixed/flist.c
---- rsync-2.5.1/flist.c	Thu Jan  3 01:09:35 2002
-+++ rsync-2.5.1-fixed/flist.c	Fri Jan 25 01:55:01 2002
-@@ -557,7 +557,7 @@
- 	file->gid = st.st_gid;
- 	file->dev = st.st_dev;
- 	file->inode = st.st_ino;
--#ifdef HAVE_ST_RDEV
-+#ifdef HAVE_STRUCT_STAT_ST_RDEV
- 	file->rdev = st.st_rdev;
- #endif
- 
-diff -urN rsync-2.5.1/io.c rsync-2.5.1-fixed/io.c
---- rsync-2.5.1/io.c	Thu Nov 29 18:21:08 2001
-+++ rsync-2.5.1-fixed/io.c	Fri Jan 25 01:54:11 2002
-@@ -438,6 +438,8 @@
- 			}
- 
- 			if (ret <= 0) {
-+				/* Don't try to write errors back across the stream */
-+				io_multiplexing_close();
- 				rprintf(FERROR,
- 					"error writing %d unbuffered bytes"
- 					" - exiting: %s\n", len,
-diff -urN rsync-2.5.1/main.c rsync-2.5.1-fixed/main.c
---- rsync-2.5.1/main.c	Thu Nov 29 18:21:08 2001
-+++ rsync-2.5.1-fixed/main.c	Fri Jan 25 01:54:11 2002
-@@ -794,10 +794,12 @@
- 	}
- 
- 	signal(SIGINT,SIGNAL_CAST sig_int);
--	signal(SIGPIPE,SIGNAL_CAST sig_int);
- 	signal(SIGHUP,SIGNAL_CAST sig_int);
- 	signal(SIGTERM,SIGNAL_CAST sig_int);
- 
-+	/* Ignore SIGPIPE; we check error codes consistently. */
-+	signal(SIGPIPE,SIG_IGN);
-+
- 	/* Initialize push_dir here because on some old systems getcwd
- 	   (implemented by forking "pwd" and reading its output) doesn't
- 	   work when there are other child processes.  Also, on all systems
diff --git a/net-misc/rsync/files/rsync-gentoo-2.5.2.patch b/net-misc/rsync/files/rsync-gentoo-2.5.2.patch
deleted file mode 100644
index f7b1f681f449..000000000000
--- a/net-misc/rsync/files/rsync-gentoo-2.5.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN rsync-2.5.2/io.c rsync-2.5.2-fixed/io.c
---- rsync-2.5.2/io.c	Fri Jan 25 16:01:50 2002
-+++ rsync-2.5.2-fixed/io.c	Fri Mar  1 00:06:31 2002
-@@ -442,6 +442,8 @@
- 			}
- 
- 			if (ret <= 0) {
-+				/* Don't try to write errors back across the stream */
-+				io_multiplexing_close();
- 				rprintf(FERROR,
- 					"error writing %d unbuffered bytes"
- 					" - exiting: %s\n", len,
-diff -urN rsync-2.5.2/main.c rsync-2.5.2-fixed/main.c
---- rsync-2.5.2/main.c	Fri Jan 25 03:07:41 2002
-+++ rsync-2.5.2-fixed/main.c	Fri Mar  1 00:06:31 2002
-@@ -835,10 +835,12 @@
- 	}
- 
- 	signal(SIGINT,SIGNAL_CAST sig_int);
--	signal(SIGPIPE,SIGNAL_CAST sig_int);
- 	signal(SIGHUP,SIGNAL_CAST sig_int);
- 	signal(SIGTERM,SIGNAL_CAST sig_int);
- 
-+	/* Ignore SIGPIPE; we check error codes consistently. */
-+	signal(SIGPIPE,SIG_IGN);
-+
- 	/* Initialize push_dir here because on some old systems getcwd
- 	   (implemented by forking "pwd" and reading its output) doesn't
- 	   work when there are other child processes.  Also, on all systems
diff --git a/net-misc/rsync/rsync-2.5.6-r2.ebuild b/net-misc/rsync/rsync-2.5.6-r2.ebuild
new file mode 100644
index 000000000000..2621bc3ae218
--- /dev/null
+++ b/net-misc/rsync/rsync-2.5.6-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.5.6-r2.ebuild,v 1.1 2003/05/22 22:11:54 mholzer Exp $
+
+inherit eutils
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/${P}.tar.gz
+	http://www.imada.sdu.dk/~bardur/personal/patches/${PN}-proxy-auth/${P}-proxy-auth-1.patch"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~hppa ~arm ~sparc ~mips ~alpha"
+SLOT="0"
+
+DEPEND="virtual/glibc
+	!build? ( >=dev-libs/popt-1.5 )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${DISTDIR}/${P}-proxy-auth-1.patch
+	cd ${S}
+
+	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
+	# configure option doesn't work
+	sed	-i 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g' rsync.h
+	# yes, updating the man page is very important.
+	sed -i 's|/etc/rsyncd|/etc/rsync/rsyncd|g' rsyncd.conf.5
+} 
+
+src_compile() {
+	[ -n "$(use build)" ] \
+		&& POPTSETTING="--with-included-popt" \
+		|| POPTSETTING=""
+	[ -z "${CC}" ] && CC=gcc
+	if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then
+		export LDFLAGS="${LDFLAGS} -lpthread"
+	fi
+	econf ${POPTSETTING} || die
+	use static && export LDFLAGS="${LDFLAGS} -static"
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	insinto /etc/conf.d && newins ${FILESDIR}/rsyncd.conf.d rsyncd
+	exeinto /etc/init.d && newexe ${FILESDIR}/rsyncd.init.d rsyncd
+	keepdir /etc/rsync
+	if [ -z "`use build`" ] ; then
+		dodir /etc/rsync
+		dodoc COPYING NEWS OLDNEWS README TODO tech_report.tex
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
+
+post_inst() {
+	einfo 'This patch enables usage of user:pass@proxy.foo:port'
+	einfo 'in the RSYNC_PROXY environment variable to support'
+	einfo 'the "Basic" proxy authentication scheme if you are'
+	einfo 'behind a password protected HTTP proxy.'
+}