* [gentoo-commits] repo/gentoo:master commit in: net-proxy/dante/, net-proxy/dante/files/
@ 2017-08-31 14:30 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-08-31 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 203d711ea427be7d9ffeee8d7a650c5ee1bc875d
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 14:20:17 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 14:30:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203d711e
net-proxy/dante: remove old
net-proxy/dante/Manifest | 2 -
net-proxy/dante/dante-1.1.19-r4.ebuild | 86 --------------------
net-proxy/dante/dante-1.4.0-r2.ebuild | 97 -----------------------
net-proxy/dante/files/dante-1.1.19-libpam.patch | 76 ------------------
net-proxy/dante/files/dante-1.1.19-socksify.patch | 16 ----
net-proxy/dante/files/dante-sockd-init | 57 -------------
6 files changed, 334 deletions(-)
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index a3aeb6faaa2..b3d5f708e7e 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,3 +1 @@
-DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936 SHA512 765e0042f323d9cb20e42642b30856132737974cd756c303d544c1a400dde5e86b6528d4233afdcf73f1baf9b3e0efacda8aabe5c04afa50495edf6e8a248b83 WHIRLPOOL c83553cbf58c6ea7651a7bfad408460c38d3cda6342825d46e0c1311a665f5422afeb00c5f936262172673764323a96377545bcd5815356dbcad3ba6c0f54f72
-DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b SHA512 978a70eb789dd2d00a9ac4a7671d13450f9ac96344ae41382c38de7a12e98c2e24159c2e140c95caff0cc9119f7cf409a8716130b34957020706a17c0f96de38 WHIRLPOOL 72e03fe8dabb71d25b34600db4e59dbbc2dfacc32ada26c9931bf33fc0050e7bd506182658517d7653027dbc4cc01e27dd1294fafef7dc3589135c16efa92d96
DIST dante-1.4.1.tar.gz 1284288 SHA256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e WHIRLPOOL ab59762ac2f429cb32afd98b396e432f9c62260dd69e8f96d384491cd8620f6530537dcaaf4c39270d0d2448ef06e85cd9018dcc93bb2366e5e8d6606be57b23
diff --git a/net-proxy/dante/dante-1.1.19-r4.ebuild b/net-proxy/dante/dante-1.1.19-r4.ebuild
deleted file mode 100644
index c35084d3c92..00000000000
--- a/net-proxy/dante/dante-1.1.19-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools user
-
-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 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="tcpd debug selinux pam"
-
-RDEPEND="pam? ( virtual/pam )
- tcpd? ( sys-apps/tcp-wrappers )
- selinux? ( sec-policy/selinux-dante )
- userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison
- >=sys-apps/sed-4"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/${P}-socksify.patch"
- epatch "${FILESDIR}/${P}-libpam.patch"
-
- sed -i \
- -e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
- -e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
- doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5}
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
- eautoreconf
-}
-
-src_compile() {
- econf \
- `use_enable debug` \
- `use_enable tcpd libwrap` \
- `use_with pam` \
- --with-socks-conf=/etc/socks/socks.conf \
- --with-sockd-conf=/etc/socks/sockd.conf \
- || die "bad ./configure"
- # the comments in the source say this is only useful for 2.0 kernels ...
- # well it may fix 2.0 but it breaks with 2.6 :)
- sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install has failed"
-
- # bor: comment libdl.so out it seems to work just fine without it
- sed -i -e 's:libdl\.so::' "${D}/usr/bin/socksify" || die 'sed failed'
-
- # default configuration files
- insinto /etc/socks
- doins "${FILESDIR}"/sock?.conf
- cd "${D}/etc/socks" && {
- use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
- use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
- }
- cd "${S}"
-
- # our init script
- newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
- newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
- # install documentation
- dodoc BUGS CREDITS NEWS README SUPPORT TODO
- docinto txt
- cd doc
- dodoc README* *.txt SOCKS4.*
- docinto example
- cd ../example
- dodoc *.conf
-}
-
-pkg_postinst() {
- enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.4.0-r2.ebuild b/net-proxy/dante/dante-1.4.0-r2.ebuild
deleted file mode 100644
index 264b96777ac..00000000000
--- a/net-proxy/dante/dante-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils systemd user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-MY_P="${P/_/-}"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd upnp"
-
-CDEPEND="pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- tcpd? ( sys-apps/tcp-wrappers )
- userland_GNU? ( virtual/shadow )
- upnp? ( net-libs/miniupnpc )"
-DEPEND="${CDEPEND}
- sys-devel/flex
- sys-devel/bison"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-dante )
-"
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.4.0-socksify.patch \
- "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \
- "${FILESDIR}"/${PN}-1.4.0-cflags.patch \
- "${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch
-
- sed -i \
- -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
- -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
- doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
- || die
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- # hardcoded the libc name otherwise the scan on a amd64 multilib system
- # ends up finding /usr/lib32/libc.so.5. That cascades and causes the
- # preload/libdsocks to not be built.
- econf \
- --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
- --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
- --enable-preload \
- --enable-clientdl \
- --enable-serverdl \
- --enable-drt-fallback \
- --with-libc=libc.so.6 \
- $(use_enable debug) \
- $(use_with kerberos gssapi) \
- $(use_with pam) \
- $(use_with upnp) \
- $(use_enable static-libs static) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- # default configuration files
- insinto /etc/socks
- doins "${FILESDIR}"/sock?.conf
- pushd "${ED}/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}/${PN}-1.3.2-sockd-init" dante-sockd
- newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
- systemd_dounit "${FILESDIR}/dante-sockd.service"
-
- # 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.1.19-libpam.patch b/net-proxy/dante/files/dante-1.1.19-libpam.patch
deleted file mode 100644
index 5c732e2f1e9..00000000000
--- a/net-proxy/dante/files/dante-1.1.19-libpam.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nru dante-1.1.19.orig/acinclude.m4 dante-1.1.19/acinclude.m4
---- dante-1.1.19.orig/acinclude.m4 2005-12-18 21:57:57.000000000 +0100
-+++ dante-1.1.19/acinclude.m4 2008-06-25 22:24:16.000000000 +0200
-@@ -260,4 +260,4 @@
-
- tproto($@)])
-
--# -- acinclude end --
-\ No newline at end of file
-+# -- acinclude end --
-diff -Nru dante-1.1.19.orig/configure.ac dante-1.1.19/configure.ac
---- dante-1.1.19.orig/configure.ac 2006-01-15 16:33:37.000000000 +0100
-+++ dante-1.1.19/configure.ac 2008-06-25 22:25:09.000000000 +0200
-@@ -21,7 +21,7 @@
- #NOTE: save CFLAGS; wish to compile without -O2 when debugging
- oCFLAGS=$CFLAGS
- unset CFLAGS
--AC_AIX #evidently also modifies CFLAGS
-+#AC_AIX #evidently also modifies CFLAGS
- AC_PROG_LIBTOOL
- autoconf_compflags=$CFLAGS
- CFLAGS=$oCFLAGS
-@@ -30,18 +30,6 @@
-
- AM_CONDITIONAL(PRERELEASE, test x$prerelease != x)
-
--#known keywords for --enable/disable-foo(=yes/no)?
--LTINTERNAL="dlopen|dlopen_self|dlopen_self_static|fast_install|libtool_lock|win32_dll|shared_with_static_runtimes|shared_with_static_runtimes_CXX|shared_with_static_runtimes_F77"
--KNOWN_KEYWORDS="$LTINTERNAL|shared|static|debug|warnings|diagnostic|profiling|linting|libwrap|preload|serverdl|clientdl|internal|pidfile"
--for keyword in `set | egrep '^enable_' | sed -e 's/^enable_\(.*\)=.*/\1/'`;
--do
-- echo $keyword | egrep "^(${KNOWN_KEYWORDS})$" > /dev/null
-- if test $? -ne 0; then
-- AC_MSG_WARN([unknown option '$keyword', ignoring ...])
-- sleep 10;
-- fi
--done
--
- #Solaris 2.5.1 is broken in many places
- case $host in
- *-*-solaris2.5.1)
-@@ -1288,15 +1288,18 @@
- [ --without-pam disable pam support @<:@default=detect@:>@],
- [PAM=$withval])
-
-+LIBPAM=
- if test "${PAM}" != no; then
- #look for PAM header and lib
- AC_CHECK_HEADERS(security/pam_appl.h, [have_pam_header=t])
-- AC_SEARCH_LIBS(pam_start, pam, [have_libpam=t])
-+ AC_CHECK_LIB(pam, pam_start, [have_libpam=t])
-
- if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then
- AC_DEFINE(HAVE_PAM, 1, [PAM support])
-+ LIBPAM=-lpam
- fi
- fi
-+AC_SUBST(LIBPAM)
-
- #expected select behaviour?
- unset nb_select_err
-diff -Nru dante-1.1.19.orig/sockd/Makefile.am dante-1.1.19/sockd/Makefile.am
---- dante-1.1.19.orig/sockd/Makefile.am 2005-11-06 18:37:14.000000000 +0100
-+++ dante-1.1.19/sockd/Makefile.am 2008-06-25 22:24:16.000000000 +0200
-@@ -35,9 +35,9 @@
-
- #XXXhack
- if STATIC_SOCKD
--sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP}
-+sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP} ${LIBPAM}
- else
--sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP}
-+sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP} ${LIBPAM}
- endif
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libscompat
diff --git a/net-proxy/dante/files/dante-1.1.19-socksify.patch b/net-proxy/dante/files/dante-1.1.19-socksify.patch
deleted file mode 100644
index 632deb1f9b5..00000000000
--- a/net-proxy/dante/files/dante-1.1.19-socksify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dante-1.1.15-pre1/bin/socksify.in.agriffis 2004-11-04 16:07:04.000000000 -0500
-+++ dante-1.1.15-pre1/bin/socksify.in 2004-11-04 16:07:08.977460049 -0500
-@@ -60,7 +60,11 @@
- @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
- export @PRELOAD_VARIABLE@
-
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
--export LD_LIBRARY_PATH
-+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
-+# LD_PRELOAD can contain a full path to the library. Setting the
-+# following breaks socksify on Linux/Alpha at least with
-+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
-+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
-+#export LD_LIBRARY_PATH
-
- exec "$@"
diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init
deleted file mode 100644
index 41211a4ad06..00000000000
--- a/net-proxy/dante/files/dante-sockd-init
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SOCKD_OPT="-D"
-[ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
-[ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d"
-[ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n"
-PIDFILE=/var/run/sockd.pid
-SOCKDIR=/var/lock/dante-sockd/
-
-depend() {
- need net
-}
-
-checkconfig() {
- # first check that it exists
- if [ ! -f /etc/socks/sockd.conf ] ; then
- eerror "You need to setup /etc/socks/sockd.conf first"
- eerror "Examples are in /usr/share/doc/dante[version]/example"
- eerror "for more info, see: man sockd.conf"
- return 1
- fi
-
- /usr/sbin/sockd -V >/tmp/dante-sockd.checkconf 2>&1
- if [ $? -ne 0 ]; then
- cat /tmp/dante-sockd.checkconf
- eerror "Something is wrong with your configuration file"
- eerror "for more info, see: man sockd.conf"
- return 1
- fi
- rm /tmp/dante-sockd.checkconf
-
- #Create pidfile with owner set to daemon's uid
- DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf`
- if [ -n "$DAEMON_UID" ]; then
- touch $PIDFILE && chown $DAEMON_UID $PIDFILE
- mkdir $SOCKDIR && chown $DAEMON_UID $SOCKDIR
- [ ! -f $SOCKDIR/.keep ] && touch $SOCKDIR/.keep
- fi
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting dante sockd"
- start-stop-daemon --start --quiet --pidfile $PIDFILE --env TMPDIR=$SOCKDIR \
- --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1
- eend $? "Failed to start sockd"
-}
-
-stop() {
- ebegin "Stopping dante sockd"
- start-stop-daemon --stop --quiet --pidfile $PIDFILE
- eend $? "Failed to stop sockd"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/dante/, net-proxy/dante/files/
@ 2024-11-18 4:09 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2024-11-18 4:09 UTC (permalink / raw
To: gentoo-commits
commit: 37a413aba50f53e16c5acb82495b4a2604db3791
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 00:12:19 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 04:09:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a413ab
net-proxy/dante: version bump
Closes: https://bugs.gentoo.org/908548
Closes: https://bugs.gentoo.org/900280
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
net-proxy/dante/Manifest | 2 +
net-proxy/dante/dante-1.4.3.ebuild | 116 +++++++++++++++++++++
net-proxy/dante/files/dante-1.4.2-cflags.patch | 32 ++++++
net-proxy/dante/files/dante-1.4.3-gai-symbol.patch | 32 ++++++
.../dante/files/dante-1.4.3-osdep-debug.patch | 16 +++
5 files changed, 198 insertions(+)
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 3ea3f92b4dd9..8550b56047b6 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1 +1,3 @@
DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
+DIST dante-1.4.3.tar.gz 1343935 BLAKE2B dc069fd99a0d4a606b1eb7ce5dabbb20be63a4b4b3b02ee5e7c6d9b5614ae89226559df9c0bdaa3bee803b04e452311ab016c9116d57f3f8f48205ec797c5475 SHA512 c19675b2dee931366caf4a0dd4f44045ae731cc2f986e5d2e4bf498925c7d93a92a32088234d4a9443424f6dfb0796a1fa3fdc7c47e5aa11612c29a101f47888
+DIST dante_1.4.3+dfsg-2.debian.tar.xz 42736 BLAKE2B 3e385eb4dee0278edfe72720139b19d4900b828372e6dc5b8361dbcf2ba76f0a0a5b523680068aa0c61fcbabac25ce413f23c96ab56c368ddda1ef8dd1fee528 SHA512 0acbb82eba1e37af0b485ac5b43cb06f5d699e5cac427a8c678fe8633a08ce5697ff936d3f1dd747cb2cc3c7ac7c713193ae07c1913e794f35fd55278c8fec16
diff --git a/net-proxy/dante/dante-1.4.3.ebuild b/net-proxy/dante/dante-1.4.3.ebuild
new file mode 100644
index 000000000000..10bfc9b77559
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools systemd
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="https://www.inet.no/dante/"
+SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
+
+PATCH_LEVEL="dfsg-2"
+[[ -n "${PATCH_LEVEL}" ]] && \
+ SRC_URI+=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}+${PATCH_LEVEL}.debian.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug kerberos pam selinux static-libs tcpd upnp"
+
+CDEPEND="
+ sys-apps/shadow
+ virtual/libcrypt:=
+ kerberos? ( virtual/krb5 )
+ pam? ( sys-libs/pam )
+ tcpd? ( sys-apps/tcp-wrappers )
+ upnp? ( net-libs/miniupnpc:= )
+"
+DEPEND="${CDEPEND}
+ app-alternatives/yacc
+ app-alternatives/lex
+"
+RDEPEND="${CDEPEND}
+ acct-group/sockd
+ acct-user/sockd
+ selinux? ( sec-policy/selinux-dante )
+"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.0-socksify.patch
+ "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+ "${FILESDIR}"/${PN}-1.4.2-cflags.patch
+ #"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch # included in debian series
+ #${FILESDIR}"/${PN}-1.4.1-sigpwr-siginfo.patch #517528 # included in debian series
+ #"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680 # upstreamed
+ "${FILESDIR}"/${PN}-1.4.3-osdep-debug.patch
+ "${FILESDIR}"/${PN}-1.4.3-gai-symbol.patch
+)
+
+src_prepare() {
+ DEB_PATCHES=${S}/../debian/patches
+ PATCHES+=(
+ $( sed "s,^,${DEB_PATCHES}/," < "${DEB_PATCHES}"/series )
+ )
+ default
+
+ # 780039
+ sed -e 's/-all-dynamic//' -i dlib/Makefile.am dlib64/Makefile.am || die
+
+ sed -i \
+ -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
+ -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
+ doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
+ || die
+
+ sed -i \
+ -e 's:AM_CONFIG_HEADER\>:AC_CONFIG_HEADERS:' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # hardcoded the libc name otherwise the scan on a amd64 multilib system
+ # ends up finding /usr/lib32/libc.so.5. That cascades and causes the
+ # preload/libdsocks to not be built.
+ econf -C \
+ --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
+ --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
+ --enable-preload \
+ --enable-clientdl \
+ --enable-serverdl \
+ --enable-drt-fallback \
+ --with-libc=libc.so.6 \
+ $(use_enable debug) \
+ $(use_with kerberos gssapi) \
+ $(use_with pam) \
+ $(use_with upnp) \
+ $(use_enable static-libs static) \
+ $(use_with tcpd libwrap)
+}
+
+src_install() {
+ default
+
+ # default configuration files
+ insinto /etc/socks
+ doins "${FILESDIR}"/sock?.conf
+ pushd "${ED}"/etc/socks > /dev/null
+ use pam && eapply -p0 "${FILESDIR}"/sockd.conf-with-pam.patch
+ use tcpd && eapply -p0 "${FILESDIR}"/sockd.conf-with-libwrap.patch
+ popd > /dev/null
+
+ # init script
+ newinitd "${FILESDIR}"/${PN}-1.3.2-sockd-init dante-sockd
+ newconfd "${FILESDIR}"/dante-sockd-conf dante-sockd
+
+ systemd_dounit "${FILESDIR}"/dante-sockd.service
+
+ # example configuration files
+ docinto examples
+ dodoc example/*.conf
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-proxy/dante/files/dante-1.4.2-cflags.patch b/net-proxy/dante/files/dante-1.4.2-cflags.patch
new file mode 100644
index 000000000000..84798de3a65f
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.2-cflags.patch
@@ -0,0 +1,32 @@
+The upstream code tries to remove -g from CFLAGS, but the logic also matches
+the -g in the middle of flags, like:
+-frecord-gcc-switches => -frecordcc-switches
+-ggdb3 => ggdb3
+Both of which cause GCC to fail horribly!
+
+Fix the grep & sed to only match standalone instances.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar dante-1.4.2.orig/compiler.m4 dante-1.4.2/compiler.m4
+--- dante-1.4.2.orig/compiler.m4 2013-10-24 13:20:23.000000000 -0700
++++ dante-1.4.2/compiler.m4 2014-01-05 15:18:03.544336373 -0800
+@@ -375,14 +375,14 @@
+ gcc)
+ if test x"$aixldbug" != x; then
+ #disable debug info
+- if echo $CFLAGS | grep -- "-g " >/dev/null; then
+- CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`"
++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ fi
+ CFLAGS="$CFLAGS${CFLAGS:+ }-g0"
+ else
+ #use -ggdb also when not debugging
+- if echo $CFLAGS | grep -- "-g " >/dev/null; then
+- CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`"
++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ fi
+ CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb"
+ fi
diff --git a/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch b/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch
new file mode 100644
index 000000000000..5f0b0303de5b
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch
@@ -0,0 +1,32 @@
+Dante's packaging design has some very pretty macro usage, but also fragile.
+
+The error & getaddrinfo error checking tries to expand a macro outside a
+string, leading to it expanding empty in some cases. Quoting the string makes
+it show up as expected.
+
+```
+checking getaddrinfo() error symbols... configure: error: in `/var/tmp/portage/net-proxy/dante-1.4.3/work/dante-1.4.3':
+configure: error: error: getaddrinfo() error value count too low
+See `config.log' for more details`
+```
+
+--- dante-1.4.3//acinclude.m4 2017-01-23 11:28:08.000000000 -0800
++++ dante-1.4.3//acinclude.m4 2024-11-17 19:51:39.398597593 -0800
+@@ -1110,7 +1114,7 @@
+ [AC_LANG_PROGRAM([[#include <errno.h>]],
+ [[
+ #ifdef $3
+-errnoval: $3
++"errnoval: $3"
+ #else
+ #error "errno value $3 not defined"
+ #endif]])],
+@@ -1134,7 +1138,7 @@
+ #include <netdb.h>]],
+ [[
+ #ifdef $3
+-gaierrval: $3
++"gaierrval: $3"
+ #else
+ #error "gai error value $3 not defined"
+ #endif]])],
diff --git a/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch b/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch
new file mode 100644
index 000000000000..f626f5b3ea9a
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch
@@ -0,0 +1,16 @@
+--- dante-1.4.3.orig/osdep.m4 2017-01-18 06:11:20.000000000 -0800
++++ dante-1.4.3/osdep.m4 2024-11-17 16:05:24.798720697 -0800
+@@ -957,11 +957,11 @@
+ if test -s $ERRVALFILE; then
+ UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'`
+ if test $UNIQUEVALS -le 1; then
+- AC_MSG_FAILURE([error: getaddrinfo() error value count too low])
++ AC_MSG_FAILURE([error: getaddrinfo() error value count too low; got $UNIQUEVALS from $ERRVALFILE])
+ fi
+ UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'`
+ if test $UNIQUESYMBOLS -le 1; then
+- AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low])
++ AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low; got $UNIQUESYMBOLS from $ERRVALFILE])
+ fi
+
+ if test $ERRNOCNT -ne $UNIQUESYMBOLS; then
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/dante/, net-proxy/dante/files/
@ 2025-02-06 12:18 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2025-02-06 12:18 UTC (permalink / raw
To: gentoo-commits
commit: a8479f02019951540c270384960b5d2e1923832b
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 6 12:16:53 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 6 12:16:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8479f02
net-proxy/dante: add fix for >=miniupnpc-2.2.8
Closes: https://bugs.gentoo.org/943787
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-proxy/dante/dante-1.4.3.ebuild | 3 +-
net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch | 247 +++++++++++++++++++++
2 files changed, 249 insertions(+), 1 deletion(-)
diff --git a/net-proxy/dante/dante-1.4.3.ebuild b/net-proxy/dante/dante-1.4.3.ebuild
index 10bfc9b77559..76e749c3cc56 100644
--- a/net-proxy/dante/dante-1.4.3.ebuild
+++ b/net-proxy/dante/dante-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -46,6 +46,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680 # upstreamed
"${FILESDIR}"/${PN}-1.4.3-osdep-debug.patch
"${FILESDIR}"/${PN}-1.4.3-gai-symbol.patch
+ "${FILESDIR}"/${PN}-1.4.3-upnp-2.2.8.patch
)
src_prepare() {
diff --git a/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch b/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch
new file mode 100644
index 000000000000..271d3094f80a
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch
@@ -0,0 +1,247 @@
+--- a/configure
++++ b/configure
+@@ -32805,6 +32805,49 @@
+ LIBS=$oLIBS
+ fi
+ if test x"${have_libminiupnp}" = xt; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for miniupnpc version >= 2.2.8" >&5
++$as_echo_n "checking for miniupnpc version >= 2.2.8... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #include <stdio.h>
++ #include <miniupnpc/miniupnpc.h>
++ #include <miniupnpc/upnpcommands.h>
++ #include <miniupnpc/upnperrors.h>
++int
++main ()
++{
++
++
++ #ifndef MINIUPNPC_API_VERSION
++ #error "no api version define"
++ #else
++ # if MINIUPNPC_API_VERSION < 18
++ #error "api version too low"
++ # endif
++ #endif
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_LIBMINIUPNP 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_LIBMINIUPNP228 1" >>confdefs.h
++
++ unset no_upnp
++ SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB"
++ DLIBDEPS="${DLIBDEPS}${DLIBDEPS:+ }$UPNPLIB"
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for miniupnpc version >= 1.7" >&5
+ $as_echo_n "checking for miniupnpc version >= 1.7... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -32822,8 +32865,8 @@
+ #ifndef MINIUPNPC_API_VERSION
+ #error "no api version define"
+ #else
+- # if MINIUPNPC_API_VERSION < 8
+- #error "api version too low"
++ # if MINIUPNPC_API_VERSION < 8 || MINIUPNPC_API_VERSION > 17
++ #error "api version too low or high"
+ # endif
+ #endif
+ ;
+--- ./include/autoconf.h.in.orig 2021-04-30 21:29:27.000000000 +0200
++++ ./include/autoconf.h.in 2025-01-13 13:18:20.846544677 +0100
+@@ -797,6 +797,9 @@
+ /* UPNP support library 1.7 */
+ #undef HAVE_LIBMINIUPNP17
+
++/* UPNP support library 2.2.8 */
++#undef HAVE_LIBMINIUPNP228
++
+ /* Define to 1 if you have the `prldap60' library (-lprldap60). */
+ #undef HAVE_LIBPRLDAP60
+
+--- ./include/common.h.orig 2021-02-02 20:34:15.000000000 +0100
++++ ./include/common.h 2025-01-13 13:16:32.969992076 +0100
+@@ -1404,9 +1404,20 @@
+ /* return codes from UPNP_GetValidIGD(). */
+ #define UPNP_NO_IGD (0)
+ #define UPNP_CONNECTED_IGD (1)
++
++#if HAVE_LIBMINIUPNP228
++
++#define UPNP_RESERVED_IGD (2)
++#define UPNP_DISCONNECTED_IGD (3)
++#define UPNP_UNKNOWN_DEVICE (4)
++
++#else /* !HAVE_LIBMINIUPNP_228 */
++
+ #define UPNP_DISCONNECTED_IGD (2)
+ #define UPNP_UNKNOWN_DEVICE (3)
+
++#endif /* !HAVE_LIBMINIUPNP_228 */
++
+ #define UPNP_SUCCESS (1)
+ #define UPNP_FAILURE (2)
+
+--- ./include/redefac.h.orig 2021-04-30 21:48:32.000000000 +0200
++++ ./include/redefac.h 2025-01-13 13:13:43.206075810 +0100
+@@ -1004,6 +1004,10 @@
+ #define HAVE_LIBMINIUPNP17 0
+ #endif
+
++#ifndef HAVE_LIBMINIUPNP228
++#define HAVE_LIBMINIUPNP228 0
++#endif
++
+ #ifndef HAVE_LIBPRLDAP60
+ #define HAVE_LIBPRLDAP60 0
+ #endif
+--- ./lib/upnp.c.orig 2020-11-11 17:11:55.000000000 +0100
++++ ./lib/upnp.c 2024-11-21 17:02:49.000000000 +0100
+@@ -42,7 +42,7 @@
+ */
+
+ static const char rcsid[] =
+-"$Id: upnp.c,v 1.153.4.4.2.2.4.2 2020/11/11 16:11:55 karls Exp $";
++"$Id: upnp.c,v 1.153.4.4.2.2.4.2.4.1 2024/11/21 16:02:49 karls Exp $";
+
+ #include "common.h"
+
+@@ -154,7 +154,7 @@
+ addrstring,
+ NULL,
+ 0
+-#if HAVE_LIBMINIUPNP17
++#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ ,0,
+
+ #if MINIUPNPC_API_VERSION >= 14
+@@ -162,7 +162,7 @@
+ #endif /* MINIUPNPC_API_VERSION >= 14 */
+
+ &rc
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+ );
+
+ #if SOCKS_CLIENT && SOCKSLIBRARY_DYNAMIC
+@@ -208,7 +208,12 @@
+ socks_autoadd_directroute(&commands, &protocols, &saddr, &smask);
+ }
+
++#if HAVE_LIBMINIUPNP228
++ devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr),
++ NULL, 0);
++#else /* !HAVE_LIBMINIUPNP228 */
+ devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr));
++#endif /* !HAVE_LIBMINIUPNP228 */
+ switch (devtype) {
+ case UPNP_NO_IGD:
+ snprintf(emsg, emsglen, "no UPNP IGD discovered on local network");
+@@ -226,6 +231,20 @@
+ rc = 0;
+ break;
+
++#if HAVE_LIBMINIUPNP228
++ case UPNP_RESERVED_IGD:
++ snprintf(emsg, emsglen,
++ "UPNP IGD discovered at url %s, but its IP is reserved",
++ str2vis(url.controlURL,
++ strlen(url.controlURL),
++ vbuf,
++ sizeof(vbuf)));
++
++ swarnx("%s: %s", function, emsg);
++ rc = -1;
++ break;
++#endif /* HAVE_LIBMINIUPNP228 */
++
+ case UPNP_DISCONNECTED_IGD:
+ snprintf(emsg, emsglen,
+ "UPNP IGD discovered at url %s, but it is not connected",
+@@ -273,12 +292,12 @@
+ #if HAVE_LIBMINIUPNP13
+ STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.servicetype);
+
+-#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17
++#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.CIF.servicetype);
+
+ #else
+ # error "unexpected miniupnp version"
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+
+ slog(LOG_NEGOTIATE, "%s: inited ok. controlurl: %s, servicetype: %s",
+ function,
+@@ -756,9 +775,9 @@
+ buf,
+ protocol,
+ NULL
+-#if HAVE_LIBMINIUPNP17
++#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ ,0
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+ )) != UPNPCOMMAND_SUCCESS) {
+ snprintf(emsg, emsglen,
+ "UPNP_AddPortMapping() failed: %s", strupnperror(rc));
+--- ./miniupnpc.m4.orig 2012-11-02 13:08:14.000000000 +0100
++++ ./miniupnpc.m4 2024-11-21 17:02:49.000000000 +0100
+@@ -20,7 +20,7 @@
+ LIBS=$oLIBS
+ fi
+ if test x"${have_libminiupnp}" = xt; then
+- AC_MSG_CHECKING([for miniupnpc version >= 1.7])
++ AC_MSG_CHECKING([for miniupnpc version >= 2.2.8])
+ AC_TRY_COMPILE([
+ #include <stdio.h>
+ #include <miniupnpc/miniupnpc.h>
+@@ -30,11 +30,33 @@
+ #ifndef MINIUPNPC_API_VERSION
+ #error "no api version define"
+ #else
+- # if MINIUPNPC_API_VERSION < 8
++ # if MINIUPNPC_API_VERSION < 18
+ #error "api version too low"
+ # endif
+ #endif],
+ [AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library])
++ AC_DEFINE(HAVE_LIBMINIUPNP228, 1, [UPNP support library 2.2.8])
++ unset no_upnp
++ SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB"
++ DLIBDEPS="${DLIBDEPS}${DLIBDEPS:+ }$UPNPLIB"],
++ [AC_MSG_RESULT(no)])
++
++ AC_MSG_CHECKING([for miniupnpc version >= 1.7])
++ AC_TRY_COMPILE([
++ #include <stdio.h>
++ #include <miniupnpc/miniupnpc.h>
++ #include <miniupnpc/upnpcommands.h>
++ #include <miniupnpc/upnperrors.h>], [
++
++ #ifndef MINIUPNPC_API_VERSION
++ #error "no api version define"
++ #else
++ # if MINIUPNPC_API_VERSION < 8 || MINIUPNPC_API_VERSION > 17
++ #error "api version too low or high"
++ # endif
++ #endif],
++ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library])
+ AC_DEFINE(HAVE_LIBMINIUPNP17, 1, [UPNP support library 1.7])
+ unset no_upnp
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-06 12:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-18 4:09 [gentoo-commits] repo/gentoo:master commit in: net-proxy/dante/, net-proxy/dante/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2025-02-06 12:18 Conrad Kostecki
2017-08-31 14:30 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox