fix broken socks.h (#82540)

Package-Manager: portage-2.0.51-r15

9 files changed, 50 insertions, 18 deletions

diff --git a/net-misc/dante/ChangeLog b/net-misc/dante/ChangeLog
index f7f1fac64f71..eca4df1bee70 100644
--- a/net-misc/dante/ChangeLog
+++ b/net-misc/dante/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/dante
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.45 2005/02/18 22:47:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.46 2005/02/22 18:45:03 mrness Exp $
+
+*dante-1.1.15-r1 (22 Feb 2005)
+
+  22 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml,
+  -files/dante-1.1.14-bindresvport.patch,
+  +files/dante-1.1.15-bindresvport.patch,
+  +files/dante-1.1.15-getipnodebyname.patch, +files/dante-sockd-conf,
+  -files/dante-sockd-conf-1.1.14-r2, +files/dante-sockd-init,
+  -files/dante-sockd-init-1.1.14-r2, +dante-1.1.15-r1.ebuild,
+  -dante-1.1.15.ebuild:
+  Fix broken socks.h and add metadata (#82540).
 
   19 Feb 2005; Daniel Black <dragonheart@gentoo.org> dante-1.1.15.ebuild:
   pam missing from IUSE. Thanks to Chetan Reddy <chetan13@gmail.com> for telling
diff --git a/net-misc/dante/Manifest b/net-misc/dante/Manifest
index 18cedc6f2eb6..8763162e1e05 100644
--- a/net-misc/dante/Manifest
+++ b/net-misc/dante/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d6bddb51fb7224909cf3e890983de021 ChangeLog 6609
-MD5 86b50a9c1a34f12e438dc9212a8beddb dante-1.1.15.ebuild 2231
-MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.14-bindresvport.patch 485
+MD5 c520e0f5c47ee855dd75e12f5b175fe7 dante-1.1.15-r1.ebuild 2239
+MD5 31de8bd1cf2b3d0725c96b5acaeed085 ChangeLog 7049
+MD5 100796800094d474431e0cac11585619 metadata.xml 246
 MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.15_pre1-socksify.patch 811
-MD5 184812cd77df081c52d4a0c540d0ba74 files/dante-sockd-conf-1.1.14-r2 474
-MD5 0e18d6df6b8f67d3872a56dc65ee4e28 files/dante-sockd-init-1.1.14-r2 1330
 MD5 5e74662c76571e30e6a190a2d4d1193a files/dante-1.1.15-optionalpam.patch 10896
-MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15 64
+MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r1 64
+MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.15-bindresvport.patch 485
+MD5 30064015b5702cf8059a1639167e8a3f files/dante-1.1.15-getipnodebyname.patch 789
+MD5 b2dd85bbe5ff89e36cfd592cfa41612f files/dante-sockd-conf 462
+MD5 47653d863c6523851ffd754671965b1a files/dante-sockd-init 1318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCFnCimdTrptrqvGERAlHgAKCBa/CtFP6p5GWZ8dOGVC9QDHEGbwCeMKyM
-+vA2LVnLs1iRJmEq23CYBF8=
-=ZMdU
+iD8DBQFCG324jiC39V7gKu0RAvuUAKDd/INVh8D9I99L9km8abaUwc0RqQCg2BCt
+8BtAwgHu6tTUtHH30ZSgW0M=
+=vhU4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dante/dante-1.1.15.ebuild b/net-misc/dante/dante-1.1.15-r1.ebuild
index 77f5b51581c1..d4bba8b1a30c 100644
--- a/net-misc/dante/dante-1.1.15.ebuild
+++ b/net-misc/dante/dante-1.1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.15.ebuild,v 1.12 2005/02/18 22:47:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.15-r1.ebuild,v 1.1 2005/02/22 18:45:03 mrness Exp $
 
 inherit gcc fixheadtails eutils
 
@@ -28,9 +28,10 @@ S=${WORKDIR}/${PN}-${MY_PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/dante-1.1.15_pre1-socksify.patch
-	epatch ${FILESDIR}/dante-1.1.14-bindresvport.patch
+	epatch ${FILESDIR}/${P}_pre1-socksify.patch
+	epatch ${FILESDIR}/${P}-bindresvport.patch
 	epatch ${FILESDIR}/${P}-optionalpam.patch
+	epatch ${FILESDIR}/${P}-getipnodebyname.patch
 
 	ht_fix_file configure configure.ac
 	sed -i \
@@ -65,9 +66,9 @@ src_install() {
 
 	# our init script
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/dante-sockd-init-1.1.14-r2 dante-sockd
+	newexe ${FILESDIR}/dante-sockd-init dante-sockd
 	insinto /etc/conf.d
-	newins ${FILESDIR}/dante-sockd-conf-1.1.14-r2 dante-sockd
+	newins ${FILESDIR}/dante-sockd-conf dante-sockd
 
 	# install documentation
 	dodoc BUGS CREDITS NEWS README SUPPORT TODO VERSION
diff --git a/net-misc/dante/files/dante-1.1.14-bindresvport.patch b/net-misc/dante/files/dante-1.1.15-bindresvport.patch
index 58535ae31037..58535ae31037 100644
--- a/net-misc/dante/files/dante-1.1.14-bindresvport.patch
+++ b/net-misc/dante/files/dante-1.1.15-bindresvport.patch
diff --git a/net-misc/dante/files/dante-1.1.15-getipnodebyname.patch b/net-misc/dante/files/dante-1.1.15-getipnodebyname.patch
new file mode 100644
index 000000000000..59db54bb9858
--- /dev/null
+++ b/net-misc/dante/files/dante-1.1.15-getipnodebyname.patch
@@ -0,0 +1,12 @@
+diff -Nru dante-1.1.15.orig/capi/socks.h dante-1.1.15/capi/socks.h
+--- dante-1.1.15.orig/capi/socks.h	2005-02-22 20:25:04.000000000 +0200
++++ dante-1.1.15/capi/socks.h	2005-02-22 20:25:33.368695168 +0200
+@@ -112,7 +112,7 @@
+ struct hostent *Rgethostbyname2 __P((const char *, int af));
+ int Rgetaddrinfo __P((const char *nodename, const char *servname,
+ 					      const struct addrinfo *hints, struct addrinfo **res));
+-struct hostent *Rgetipnodebyname __P((const char *name, int af, int flags,
++struct hostent *Rgetipnodebyname __P((const char *name, int af, int flags, int *error_num));
+ ssize_t Rwrite __P((int d, const void *buf, size_t nbytes));
+ ssize_t Rwritev __P((int d, const struct iovec *iov, int iovcnt));
+ ssize_t Rsend __P((int s, const void *msg, size_t len, int flags));
diff --git a/net-misc/dante/files/dante-sockd-conf-1.1.14-r2 b/net-misc/dante/files/dante-sockd-conf
index e2b9a3ef25d4..9eb666eb6f07 100644
--- a/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
+++ b/net-misc/dante/files/dante-sockd-conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-conf-1.1.14-r2,v 1.3 2004/07/14 23:56:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-conf,v 1.1 2005/02/22 18:45:03 mrness Exp $
 
 # Number of processes to fork off
 # 1 is plenty for most users
diff --git a/net-misc/dante/files/dante-sockd-init-1.1.14-r2 b/net-misc/dante/files/dante-sockd-init
index 92128899ddb5..8335765662c2 100644
--- a/net-misc/dante/files/dante-sockd-init-1.1.14-r2
+++ b/net-misc/dante/files/dante-sockd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init-1.1.14-r2,v 1.3 2004/07/14 23:56:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init,v 1.6 2005/02/22 18:45:03 mrness Exp $
 
 SOCKD_OPT="-D"
 [ "${SOCKD_FORKDEPTH}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
diff --git a/net-misc/dante/files/digest-dante-1.1.15 b/net-misc/dante/files/digest-dante-1.1.15-r1
index 88330bda9942..88330bda9942 100644
--- a/net-misc/dante/files/digest-dante-1.1.15
+++ b/net-misc/dante/files/digest-dante-1.1.15-r1
diff --git a/net-misc/dante/metadata.xml b/net-misc/dante/metadata.xml
new file mode 100644
index 000000000000..df682757ed24
--- /dev/null
+++ b/net-misc/dante/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>www-proxy</herd>
+<longdescription>A free socks4, socks5 and msproxy implementation</longdescription>
+</pkgmetadata>