Respect CFLAGS thanks to Agostino Sarubbo (bug #377353).

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

4 files changed, 134 insertions, 9 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 6d04f68a2b21..08cf0be67c5d 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.57 2011/06/26 02:22:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.58 2011/08/02 03:01:10 jer Exp $
+
+*dante-1.3.1-r1 (02 Aug 2011)
+
+  02 Aug 2011; Jeroen Roovers <jer@gentoo.org> +dante-1.3.1-r1.ebuild,
+  +files/dante-1.3.1-flags.patch:
+  Respect CFLAGS thanks to Agostino Sarubbo (bug #377353).
 
 *dante-1.3.1 (26 Jun 2011)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 196aaeee9465..7eaf34c554d6 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -5,6 +5,7 @@ AUX dante-1.1.19-libpam.patch 2688 RMD160 120d53814c7d9b51cad038ffd08e8794eb50b8
 AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
 AUX dante-1.2.3-socksify.patch 993 RMD160 4d9fa2256b15a58cb2b11fb86d044ddf5661095d SHA1 3f434ee41152263b5df9e6d418efc01be2e0e074 SHA256 f71c07df0765c600a9509faa7c6fcc3a2617a98897a234f457925980883d6351
 AUX dante-1.3.0-socksify.patch 987 RMD160 479f3418c600a5ef9d0f327d804490fae7d0ce9d SHA1 c0b55bdaac92b8122c5bd9f8c5daad98b772c566 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1
+AUX dante-1.3.1-flags.patch 1012 RMD160 ded829fa9a0c3722694a1fa1b6691148a89d3b9e SHA1 d723b49e92d5ece6f6c583d7da68b98cef7372a9 SHA256 731758799fc94be04d141310482800f3948e4b1ca2c1089543d63f94a90a0824
 AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
 AUX dante-sockd-init 1660 RMD160 8fe9aed45d614a691709ead7e72542cfa76417f5 SHA1 1143e90a30d470e3d91146c9ac588d82eaa2e263 SHA256 3297ab1d5a5b1d3324fdac27a626f34ca281aa2664ee9a779aa161dfa41fc2fa
 AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
@@ -18,17 +19,14 @@ DIST dante-1.3.1.tar.gz 943704 RMD160 4a2f39c7b5290a33df2bfcdc94a891b40062171d S
 EBUILD dante-1.1.19-r4.ebuild 2308 RMD160 3ccc61d4d022e00eab72dcd7572f37fd2d27056d SHA1 dd89d0cae1d51ef61314a5f94efb896ec16ec803 SHA256 78717342b7fdff78b26a30e0e33a5767dfc8dad0a5fa52b9765b83947454f6f5
 EBUILD dante-1.2.3.ebuild 1981 RMD160 da3e464f3e759a157600b4a6a6eb0a6e31d7a3f6 SHA1 282cbc0af30ca09e355244e6c1aec485d492dddf SHA256 9fe0934a30046363b64b9ad884b6a78aeb7b57dfa84c8e7cd6dfc2500076fbd6
 EBUILD dante-1.3.0.ebuild 1976 RMD160 e2630d324dfc0318f77b7e5100732992de372c3d SHA1 ca75cb8c36cd7a20669a9504db6d5259b1b3a483 SHA256 b5f0aed87d4948f2d0b02ad1df1c639b1a4c09f15bd0766b98399c69165e9be3
+EBUILD dante-1.3.1-r1.ebuild 2062 RMD160 a637de275facb5d6b8ed2ecf68dcd4a9a43af104 SHA1 3cdd49dbb0d5cca5540203caaf804d79a4d05eb1 SHA256 5d1ee717efc2641a73d3f68fa7c3007273429c0c2e5bb9df07bfa32fe9bfdb7c
 EBUILD dante-1.3.1.ebuild 1983 RMD160 4a9eae975b2ae8ac4d4e2aa6b18882e129d113bb SHA1 99db084777cd552e710ba655162ce89f3155388c SHA256 2e8a5eaec3d13a96009e43d3c84b742461442ff7880c057c666701efb506850d
-MISC ChangeLog 15009 RMD160 785e77d612f58d8d900a2bf582642dcbe20053e2 SHA1 5b311da774495d1c36486bdd54784722cb97f212 SHA256 2f247e78d3ebf84a8032f4adb601aef953e152337e2d95135053dd893d6ddb5a
+MISC ChangeLog 15199 RMD160 6e32f45e629b70f953a2b06e02453d77be194317 SHA1 57b10abd109d7c0b21807000cd10a115600d34e7 SHA256 ef0c2b57a96b46ada1df85aebfce0ab2c67e6e9290f9a2d890f04bdaef635744
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOBpgDAAoJEEqz6FtPBkyjnkUH/i6B9/5qXpa8s8sASfbfBRWa
-WGVP8AXJJpUGjS6hNgID91/qNHqgNcFz/bdpUzoBIjJBhJJlUQNffjmIPEU7/QIj
-66sMOfqdAmWThR4xRJPGww3XdVXwriaZdX4kLF+gjhj7Al3QVONnfqgxtdIKZYlM
-wE5sODOBU+isjNlhhBwOZG63wR0XY3omBdfF2efXfDITpgYRGjFeVi5eOrg/MWYW
-ntcwsNBprhpHo4UstBzQ1vtitKdSoixniYKT3KRg4uKV5HjQhDhj/g2XvOaEWCtS
-+jfyxcSvfn+lUNwmXkMusQGdjeS26eXbNXN5fBFODTbD3d7auYQxtVoBSIYI/FQ=
-=2Iw1
+iEYEARECAAYFAk43aHwACgkQVWmRsqeSphPwPgCeINUEBVEKt6+b+IjB2FnA6+TW
+uz4Anj3ArZAqhy8mwDaNoTbHPMbUr2gy
+=Ak+s
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.3.1-r1.ebuild b/net-proxy/dante/dante-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..7fb2a7922a98
--- /dev/null
+++ b/net-proxy/dante/dante-1.3.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.1-r1.ebuild,v 1.1 2011/08/02 03:01:10 jer Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="http://www.inet.no/dante/"
+SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug kerberos pam selinux static-libs tcpd"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-dante )
+	tcpd? ( sys-apps/tcp-wrappers )
+	userland_GNU? ( sys-apps/shadow )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
+		"${FILESDIR}"/${PN}-1.3.1-flags.patch
+
+	sed -i \
+		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
+		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
+		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
+		|| die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-socks-conf=/etc/socks/socks.conf \
+		--with-sockd-conf=/etc/socks/sockd.conf \
+		--without-upnp \
+		$(use_enable debug) \
+		$(use_with kerberos gssapi) \
+		$(use_with pam) \
+		$(use_enable static-libs static) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	# default configuration files
+	insinto /etc/socks
+	doins "${FILESDIR}"/sock?.conf
+	pushd "${D}/etc/socks" > /dev/null
+	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
+	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
+	popd > /dev/null
+
+	# init script
+	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
+	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
+
+	# example configuration files
+	docinto examples
+	dodoc example/*.conf
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
+}
+
+pkg_postinst() {
+	enewuser sockd -1 -1 /etc/socks daemon
+}
diff --git a/net-proxy/dante/files/dante-1.3.1-flags.patch b/net-proxy/dante/files/dante-1.3.1-flags.patch
new file mode 100644
index 000000000000..fb8c211b3a0a
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.3.1-flags.patch
@@ -0,0 +1,43 @@
+Respect CFLAGS (bug #377353) -JeR
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,18 +199,6 @@
+     #XXX make sure compiling with compiler options works
+ esac
+ 
+-AC_MSG_CHECKING([for support for -pipe compiler flag])
+-oCFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_RUN([
+-int main()
+-{
+-	return 0;
+-}], [AC_MSG_RESULT([yes])
+-     comp_flags="${comp_flags} -pipe"],
+-    AC_MSG_RESULT([no]))
+-CFLAGS="$oCFLAGS"
+-
+ AC_MSG_CHECKING([for support for -Wbounded compiler flag])
+ oCFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Wbounded"
+@@ -233,18 +221,11 @@
+  fi])
+ 
+ if test x$debug_enabled = xt; then
+-    #no optimization wanted
+-    if test $ac_cv_prog_cc_g = yes; then
+-	CFLAGS="$CFLAGS -g"
+-    fi
+     CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=1"
+     AC_MSG_RESULT([yes])
+ else
+     AC_MSG_RESULT([no])
+-    #autoconf_compflags is set to "-g -O2" with GCC
+-    #override CFLAGS when running configure to avoid this
+     CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=0"
+-    CFLAGS="$CFLAGS $autoconf_compflags"
+ fi
+ 
+ #-Wall ?