[proxychains/f17] fix build against modern glibc (getnameinfo struct types change)

Tom Callaway spot at fedoraproject.org
Thu Mar 8 17:42:52 UTC 2012


commit 4c63edb67ecf51918c26c3ef6fa99ec6ce038b4a
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 8 12:42:49 2012 -0500

    fix build against modern glibc (getnameinfo struct types change)

 proxychains-3.1-glibc215.patch |   12 ++++++++++++
 proxychains.spec               |   22 ++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/proxychains-3.1-glibc215.patch b/proxychains-3.1-glibc215.patch
new file mode 100644
index 0000000..ee62443
--- /dev/null
+++ b/proxychains-3.1-glibc215.patch
@@ -0,0 +1,12 @@
+diff -up proxychains-3.1/proxychains/libproxychains.c.gcc47 proxychains-3.1/proxychains/libproxychains.c
+--- proxychains-3.1/proxychains/libproxychains.c.gcc47	2012-03-08 12:36:17.254991890 -0500
++++ proxychains-3.1/proxychains/libproxychains.c	2012-03-08 12:39:31.144369931 -0500
+@@ -291,7 +291,7 @@ void freeaddrinfo(struct addrinfo *res)
+ int getnameinfo (const struct sockaddr * sa,
+ 			socklen_t salen, char * host,
+ 			socklen_t hostlen, char * serv,
+-			socklen_t servlen, unsigned int flags)
++			socklen_t servlen, int flags)
+ {
+ 	int ret = 0;
+ 	if(!init_l)
diff --git a/proxychains.spec b/proxychains.spec
index 4adaa45..342e628 100644
--- a/proxychains.spec
+++ b/proxychains.spec
@@ -1,16 +1,13 @@
 Name:		proxychains
 Version:	3.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Provides proxy support to any application
-
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://proxychains.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		proxychains-3.1-ld_preload.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#BuildRequires:  
+Patch1:         proxychains-3.1-glibc215.patch
 Requires:	bind-utils
 
 %description
@@ -20,33 +17,24 @@ them through a user defined proxy
 
 You must configure /etc/proxychains.conf before use
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .ld_preload
-
+%patch1 -p1 -b .glibc215
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %config(noreplace) %{_sysconfdir}/proxychains.conf
 %{_bindir}/proxychains
@@ -54,8 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libproxychains.so.3
 %{_libdir}/libproxychains.so.3.0.0
 
-
 %changelog
+* Thu Mar  8 2012 Tom Callaway <spot at fedoraproject.org> - 3.1-11
+- fix build against modern glibc (getnameinfo struct types change)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list