From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- net-proxy/cntlm/Manifest | 5 ++- net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild | 50 ---------------------- net-proxy/cntlm/cntlm-0.93_beta5-r4.ebuild | 50 ++++++++++++++++++++++ .../cntlm/files/cntlm-0.93_beta5-buildsystem.patch | 8 ++-- .../files/cntlm-0.93_beta5-configure-clang16.patch | 31 ++++++++++++++ 5 files changed, 88 insertions(+), 56 deletions(-) delete mode 100644 net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild create mode 100644 net-proxy/cntlm/cntlm-0.93_beta5-r4.ebuild create mode 100644 net-proxy/cntlm/files/cntlm-0.93_beta5-configure-clang16.patch (limited to 'net-proxy/cntlm') diff --git a/net-proxy/cntlm/Manifest b/net-proxy/cntlm/Manifest index a14c6d033174..d1933ef5c4c2 100644 --- a/net-proxy/cntlm/Manifest +++ b/net-proxy/cntlm/Manifest @@ -1,7 +1,8 @@ -AUX cntlm-0.93_beta5-buildsystem.patch 6380 BLAKE2B fb369c29fcb093910d4c27c7d090766e0f706dd26de85bc90f417d9b7b0599d2a1b8797533b0d94c4c53072f64c1c96457cc41bc32295cba80a03496b4f59053 SHA512 fbd51773feeceb130cf1ba0345a8d169611e038a7ced8633511ac8f907c0f04b515b42b618f3058d9a0325dd6b76b08a3969f65fa8c1c67c5d886ce978ee54a3 +AUX cntlm-0.93_beta5-buildsystem.patch 6244 BLAKE2B e68da1594f1ccfb6ca914463c921f794f2e3afc8dae4c9a1da747e81aacba6d2b4af10d6b43a52ce85f9a99c3a65c4057eef6924ffc96b9d9aedd379f27bed5b SHA512 fca549a0dd0b9f01cc1a1e6cfd6c115f285df89bccbc78ec3da70f67c40ac681fb6f72c7a326dbc27d8b4e07852f63c0f0c25d68a16828b7aec58a872dcc3700 +AUX cntlm-0.93_beta5-configure-clang16.patch 1310 BLAKE2B 9bec35e7a59bd4f4f07a50072e1e8de8f37cb1cfa0fafe3612b3ef6a2da25ad60b005451cb3262146f778f2781ed0b5f0ef484dfe8c9ed805935b6cce2529fac SHA512 4f2bb715401185b0c502b7a4bc66b9e4c1116d31012ddcb98bf1a550030459af5d506ed7a0f781a35dc9d272d37a701236476d1278139d2636d499fcd5811239 AUX cntlm.confd 150 BLAKE2B 8a421270797d3a248383b3c89b0cbd064b16d022dfbf3538ac921327f448888c3ea164b967331ddf7d1bc9c5c4df7eba1760000a101d944b681b5029811bd981 SHA512 e2ff84cbb17265e5ba1a8be9d66294dd714c9b42f9977548305447413ca3763ad18035c90c723cbdc5e3fdb5e87005f597a1a441f57c9aec2612558c7534e697 AUX cntlm.initd 480 BLAKE2B 9ff99a0189c04f7550fa201c7c1fb7d65e4b314c3230de0299e9a24ef82d9140d332a191b9b2b0d80a1e7d499d8aaf57de24d5d20ef25c5e478850f3b1e623dd SHA512 ceef9827bf8d3910d46daea09d3de9f111b7fb60ee2140abca5375fbcd62a0ee49838331b8ec9c292219bbc46b6ced0ed0bd869bf8fa1e2d31906b81eed6d43d AUX cntlm.service 207 BLAKE2B 1297446b05325a36e632b80743e67820db70c8ffb9db5119c19c63aabe48fb2cdc18a76a5a305627cdb85939661b0fe2e4a4920b4eb57239752f0173ed6b5b3c SHA512 5084b6e65b4b91120a8fe369f7cec1566103db04f1c25f9d13241e8051a49bc776bc68601992e02156719623f0f62e6e77f3781a40776601b19faa53e1039324 DIST cntlm-0.93beta5.tar.gz 718018 BLAKE2B daaf75f42c63dd191dfe36bd326dad42d0b7f774749d2dc644d4009fdf6d9b22c863759ed6ad0425fe8bde31ed99fa358c04254f6e83d67d49c719d8e088a62b SHA512 5cb59788a0d6dc5cd787acb36dbe6de9a3909727d63327c9a12b20973619b777add9e0acbe94ed6a3cf1c189ef0e0ac6c01aa3c1c4739881bbd371b4c90744cd -EBUILD cntlm-0.93_beta5-r3.ebuild 985 BLAKE2B 6422fa020c1390d485c6cb51868d63fbcc8ddd3355c34fcfdce33253adaf063a00b1dbacda7da52e4369d49745922dca03203371cef47887adb8d808e95a3fc6 SHA512 688cc3c24e1dbf281dfca4abfb47e590fa9c63f3d6805480e991aeb06f5ceab56db13de49d1eab1d6bc94b265c9ff42174963fd93254e03dd845a1a12b95adc5 +EBUILD cntlm-0.93_beta5-r4.ebuild 1008 BLAKE2B 8dca88d1f6b8c272c68e9acd4ea9fb8eeff5ef85efecc8f492af4b32d4f7972e9b44d68cb8f2c46c763ed20d49731992ad9ee9cd6c18f0cce8372bfd48c4811c SHA512 a477707fb5c0a8bba4812d719c5909cf10baf00c8b75c12b60e43fe9af5219066adfa19ebb4af06b8d3d94490961607932b24c8e5501171d614ecfd690501331 MISC metadata.xml 243 BLAKE2B cf3a43337dea0592346dc965355ddbfc135ce2c9d7b6208ac16c02ada34c65017be6dadd60cfb608be5271d467a6c1747af30576f6e63390c3d46fbc8a9558c3 SHA512 3490b91e71772c5c6ac68602b1cfc9260627093df8d78f5eea21db31e666b02f8de55536738ee60af1b6b2b43fe9cede244a84f55272d512bcd3b4ee0a2d9326 diff --git a/net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild b/net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild deleted file mode 100644 index 4c6879ddacc1..000000000000 --- a/net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -DESCRIPTION="Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy" -HOMEPAGE="http://cntlm.sourceforge.net/" -SRC_URI="http://ftp.awk.cz/pub/${P//_}.tar.gz" -S="${WORKDIR}/${P//_}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - acct-group/cntlm - acct-user/cntlm -" - -src_prepare() { - default - eapply -p0 "${FILESDIR}"/${P}-buildsystem.patch # 334647 -} - -src_configure() { - tc-export CC - - econf - - # Replace default config file path in Makefile - sed -e 's~SYSCONFDIR=/usr/local/etc~SYSCONFDIR=/etc~' -i "${S}"/Makefile || die -} - -src_compile() { - emake V=1 -} - -src_install() { - dobin cntlm - dodoc COPYRIGHT README VERSION doc/cntlm.conf - doman doc/cntlm.1 - newinitd "${FILESDIR}"/cntlm.initd cntlm - newconfd "${FILESDIR}"/cntlm.confd cntlm - systemd_dounit "${FILESDIR}"/cntlm.service - insinto /etc - insopts -m0600 - doins doc/cntlm.conf -} diff --git a/net-proxy/cntlm/cntlm-0.93_beta5-r4.ebuild b/net-proxy/cntlm/cntlm-0.93_beta5-r4.ebuild new file mode 100644 index 000000000000..91df0610c922 --- /dev/null +++ b/net-proxy/cntlm/cntlm-0.93_beta5-r4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +DESCRIPTION="Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy" +HOMEPAGE="http://cntlm.sourceforge.net/" +SRC_URI="http://ftp.awk.cz/pub/${P//_}.tar.gz" +S="${WORKDIR}/${P//_}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/cntlm + acct-user/cntlm +" + +PATCHES=( + "${FILESDIR}"/${P}-buildsystem.patch # bug #334647 + "${FILESDIR}"/${P}-configure-clang16.patch +) + +src_configure() { + tc-export CC + + econf + + # Replace default config file path in Makefile + sed -e 's~SYSCONFDIR=/usr/local/etc~SYSCONFDIR=/etc~' -i "${S}"/Makefile || die +} + +src_compile() { + emake V=1 +} + +src_install() { + dobin cntlm + dodoc COPYRIGHT README VERSION doc/cntlm.conf + doman doc/cntlm.1 + newinitd "${FILESDIR}"/cntlm.initd cntlm + newconfd "${FILESDIR}"/cntlm.confd cntlm + systemd_dounit "${FILESDIR}"/cntlm.service + insinto /etc + insopts -m0600 + doins doc/cntlm.conf +} diff --git a/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch b/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch index d553e8661484..d6df267582d4 100644 --- a/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch +++ b/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch @@ -1,8 +1,8 @@ Gentoo Bug#334647: Respect CC, CFLAGS, LDFLAGS (with gcc). Support verbose building via 'make V=1'. ---- configure.orig 2012-10-02 14:01:48.735669564 +0200 -+++ configure 2012-10-02 14:23:01.224271511 +0200 +--- a/configure.orig ++++ b/configure @@ -10,7 +10,7 @@ # This can be disabled if neccessary. # @@ -57,8 +57,8 @@ Support verbose building via 'make V=1'. rc=$? if [ $rc -ne 0 ]; then # -o -n "$OUT" ]; then ---- Makefile.orig 2012-10-02 15:31:03.986270993 +0200 -+++ Makefile 2012-10-02 15:40:10.277689068 +0200 +--- a/Makefile.orig ++++ b/Makefile @@ -16,14 +16,13 @@ CC := gcc VER := $(shell cat VERSION) diff --git a/net-proxy/cntlm/files/cntlm-0.93_beta5-configure-clang16.patch b/net-proxy/cntlm/files/cntlm-0.93_beta5-configure-clang16.patch new file mode 100644 index 000000000000..3cfde3cbbd5a --- /dev/null +++ b/net-proxy/cntlm/files/cntlm-0.93_beta5-configure-clang16.patch @@ -0,0 +1,31 @@ +Based on https://sourceforge.net/p/cntlm/bugs/79/ but rebased on our cntlm-0.93_beta5-buildsystem.patch. +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ LIBS := $(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl") + LDFLAGS := -pthread + CYGWIN_REQS := cygwin1.dll cyggcc_s-1.dll cygstdc++-6.dll cygrunsrv.exe + +-CFLAGS=-D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"'$(VER)'\" ++CFLAGS=-D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -D_DEFAULT_SOURCE -DVERSION=\"'$(VER)'\" + ifeq ($(DEBUG),1) + CFLAGS += -g -O0 + endif +--- a/config/gethostname.c ++++ b/config/gethostname.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include + + int main(int argc, char **argv) { +--- a/configure ++++ b/configure +@@ -67,7 +67,7 @@ rm -f $CONFIG + for i in $TESTS; do + printf "Checking $i... " + printf "#define config_$i " >> $CONFIG +- OUT=`$CC $CFLAGS $LDFLAGS -D_POSIX_C_SOURCE=199506L -D_ISOC99_SOURCE -D_REENTRANT -o config/$i config/$i.c 2>&1` ++ OUT=`$CC $CFLAGS $LDFLAGS -D_POSIX_C_SOURCE=199506L -D_ISOC99_SOURCE -D_DEFAULT_SOURCE -D_REENTRANT -o config/$i config/$i.c 2>&1` + rc=$? + + if [ $rc -ne 0 ]; then # -o -n "$OUT" ]; then -- cgit v1.2.3