From b94ab464dd0d948b7e7eac833b9bb51c03515918 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Sep 2022 09:22:29 +0100 Subject: gentoo auto-resync : 29:09:2022 - 09:22:29 --- www-apache/pwauth/Manifest | 4 +- www-apache/pwauth/files/pwauth-2.3.10-clang.patch | 39 +++++++++++ .../pwauth/files/pwauth-2.3.10-warnings.patch | 51 +++++++++++++++ www-apache/pwauth/pwauth-2.3.10-r1.ebuild | 73 --------------------- www-apache/pwauth/pwauth-2.3.10-r2.ebuild | 75 ++++++++++++++++++++++ 5 files changed, 168 insertions(+), 74 deletions(-) create mode 100644 www-apache/pwauth/files/pwauth-2.3.10-clang.patch create mode 100644 www-apache/pwauth/files/pwauth-2.3.10-warnings.patch delete mode 100644 www-apache/pwauth/pwauth-2.3.10-r1.ebuild create mode 100644 www-apache/pwauth/pwauth-2.3.10-r2.ebuild (limited to 'www-apache/pwauth') diff --git a/www-apache/pwauth/Manifest b/www-apache/pwauth/Manifest index cb5e6a91c6d5..2f4469843730 100644 --- a/www-apache/pwauth/Manifest +++ b/www-apache/pwauth/Manifest @@ -1,7 +1,9 @@ +AUX pwauth-2.3.10-clang.patch 705 BLAKE2B 19c71e714e4193b60f0288571df9d8665ef89711f3a73fb907af0b7ae229dad94cd1b63bce0aa3f61a4c7920d9a7e0a0b6bf4826f487fea84803f80193bd6e68 SHA512 2bd6eb86a8023f8385e8ba01b4b3c411d1a6e98e4cb9d9c5eac124c9be67ec12bb802a5a252eb2e1d366f58624573cb939b907b90d22f7ea6a49b5f1a25f5338 AUX pwauth-2.3.10-config.patch 1137 BLAKE2B 715d28153699f88f15212121587656d63c2747f006392a3a51decabb7939d7937f3b9502cde68811b2166b8b2ebf6d4b57a197699def068cb1cb54f4f6bcd425 SHA512 a622e1874d4a2ba0c7763fa5c3e24aa7ef3da64411962a8b414901716615142246abb65da6abeb37162b69423d8a77b29560f27c3f0ba35009968d51d4960a44 AUX pwauth-2.3.10-makefile.patch 1467 BLAKE2B f61025ea2ab7997ead44ee6af0604d789bb6889d4054364792b16f50e914eee64e16831f13521ffb857f9b50e9ed787e9a6e6be2af6ae4b8d2eab1da70aed937 SHA512 2a5a2802f50e42d118ffe080a282ae478557307417c0c4a907934552923a91f811b797dea49ca48e50ec0a748e35c41fab50540eb1a8c44c505dcbec7dd39d8f +AUX pwauth-2.3.10-warnings.patch 1081 BLAKE2B 174d9362314acf9077a9a5ffc1e9d3cdfbac96b28d5d70bfcb95641de2bc3a8f043478e002cc587d3e0edc3613da0156c2b2ae5c6da5217ad8de972330aa138b SHA512 4f35afdc5bab766c9beaca2944d4dd0bdc29fb40f2a2ea4a53770515bc64fc79ae4e8579d3ba7e86ea09f06f32151d3d05014926285977db2efaaaa001bfd5a6 AUX pwauth-strchr.patch 271 BLAKE2B 9d2e56e7032002f2d33f9dd48deba9acf1a26c7612494d864f67f2cd0e5faa1e197bd234316d6cc2180fe4a418cf88cfd94999eca5370b8ce0a71d7b61f144c0 SHA512 6f0754fb69922c5655cdecb67d4612dc2f8a4e386e09ba64f59466f5c8cc740381a379e8d53b8d4a773e75e3baaede4726356eb13e7fccfbec8c3c48cb0245ba AUX pwauth.pam-include 174 BLAKE2B c81c30aa536dcc6343d24661bf9d9b0f237f5123592da075c3abae6e25aa7112f1fac2c94fadb9cf3741c35f17fdf721e5d5760981402283706603ab107e042e SHA512 0169ddc1945230570491c5a3e6d21ba521d2b44dde35ff84d5c4def07b7f09c51ddb99c03f401a02a4f913036e1cd8babdfbc38cd5eaa27cccd5c3618cbe17cd DIST pwauth-2.3.10.tar.gz 23825 BLAKE2B 193a90a0f81af38ac336d56625c3cc585c160da4f98e3332d1b65d3ad03a2bb09afc04e86a35beb1ce40c16d32fc42debec19d2eeea70564c77b87e3fab5c3ad SHA512 a2f02f2c8b61d87cc0c034952e17f187bbc358506052a31107ccd38a938d59862f0ee18362c84984c900d2986bb35abbbd5877d4cf973a0215a6ec3656a23bff -EBUILD pwauth-2.3.10-r1.ebuild 1953 BLAKE2B af43375a3ae4c0fdee2e93821ce90559209c2a7224d81a5f675fe414489398176b764a3817998e2b03bd6216cd1da2ff741c7788524abecc7a3d0d4d3438ad5d SHA512 ad31d4eae99cf1c095450641d59cdb2db9f4247dc50144f5329f29b5a243a1afee8e8902ff4885d70ad791fc207422766189954494b749e37ccd2e9045bd9db0 +EBUILD pwauth-2.3.10-r2.ebuild 2020 BLAKE2B 2ab157d3f47150f33391c06b036d9c664c15568554c887507f31c9af445c0ce7f653a118b413629c92ceca3297a8b21c8709946495abfbcdafa21ff9f4aae177 SHA512 0782858e6ba2da6bd8f69b51a4d02d54d5a3a8590f450c4cdd203ddcbd879fed4a324d81788bc3af137e26b324f42a124060036a08d7baf10b514d8bf84cfd9d MISC metadata.xml 503 BLAKE2B cfe99dc610efd360b973688a9d50ba77291db6bbf9cdd94a2baf41578747cf36c0d99c412a38af2922eb7d28c3f57c78ca5b8c699dd4536c0fa4dd103b4a92be SHA512 1f570ce3e71b5749f733a4f53a29224148b89e5ab7000bac7a221d0b26bf181644a3336dfb3da244eff84deed59929886a470ebfbf8efd33286a48f53b0741b1 diff --git a/www-apache/pwauth/files/pwauth-2.3.10-clang.patch b/www-apache/pwauth/files/pwauth-2.3.10-clang.patch new file mode 100644 index 000000000000..ac241b465dde --- /dev/null +++ b/www-apache/pwauth/files/pwauth-2.3.10-clang.patch @@ -0,0 +1,39 @@ +Minimal additional fixes for with both clang16 and older clang. + +https://bugs.gentoo.org/870631 +See also: https://github.com/phokz/pwauth/pull/13 +--- a/auth_sun.c ++++ b/auth_sun.c +@@ -33,2 +33,3 @@ + ++#include + #include "pwauth.h" +--- a/fail_log.c ++++ b/fail_log.c +@@ -33,2 +33,3 @@ + ++#include + #include "pwauth.h" +@@ -72,3 +73,3 @@ + +-void log_failure() ++void log_failure(void) + { +@@ -151,3 +152,3 @@ + +-log_failure() ++void log_failure(void) + { +--- a/nologin.c ++++ b/nologin.c +@@ -40,3 +40,3 @@ + +-check_nologin() ++int check_nologin(void) + { +--- a/pwauth.h ++++ b/pwauth.h +@@ -133 +133,3 @@ + int check_auth(char *login, char *passwd); ++int check_nologin(void); ++void log_failure(void); diff --git a/www-apache/pwauth/files/pwauth-2.3.10-warnings.patch b/www-apache/pwauth/files/pwauth-2.3.10-warnings.patch new file mode 100644 index 000000000000..29faff3e0e9c --- /dev/null +++ b/www-apache/pwauth/files/pwauth-2.3.10-warnings.patch @@ -0,0 +1,51 @@ +Backport to fix some clang16 issues. +https://bugs.gentoo.org/870631 + +https://github.com/phokz/pwauth/commit/c1e7fd9af0 +From: Philip Prindeville +Date: Mon, 23 Jul 2018 13:41:47 -0600 +Subject: [PATCH] Quiet compiler warnings for signatures + +There are missing/incomplete function declarations. Also a missing +header. +--- a/lastlog.c ++++ b/lastlog.c +@@ -31,6 +31,8 @@ + * ======================================================================= + */ + ++#include ++ + #include "pwauth.h" + + /* LASTLOG - update the system's lastlog */ +--- a/main.c ++++ b/main.c +@@ -44,6 +44,7 @@ int server_uids[]= {SERVER_UIDS, 0}; + #endif + + ++int + main(int argc, char **argv) + { + #ifdef ENV_METHOD +--- a/pwauth.h ++++ b/pwauth.h +@@ -127,3 +127,7 @@ extern int haveuid; + #ifndef BFSZ + # define BFSZ 1024 + #endif ++ ++void snooze(int seconds); ++void lastlog(void); ++int check_auth(char *login, char *passwd); +--- a/snooze.c ++++ b/snooze.c +@@ -42,6 +42,7 @@ + * sleep time, if other pwauth processes are in sleeps. + */ + ++void + snooze(int seconds) + { + int slfd; diff --git a/www-apache/pwauth/pwauth-2.3.10-r1.ebuild b/www-apache/pwauth/pwauth-2.3.10-r1.ebuild deleted file mode 100644 index 99e0dfdf3fe0..000000000000 --- a/www-apache/pwauth/pwauth-2.3.10-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic pam toolchain-funcs - -DESCRIPTION="A Unix Web Authenticator" -HOMEPAGE="https://github.com/phokz/pwauth/tree/master/pwauth" -SRC_URI="https://pwauth.googlecode.com/files/${P}.tar.gz" - -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="faillog pam ignore-case domain-aware" - -DEPEND="pam? ( sys-libs/pam ) - !pam? ( virtual/libcrypt:= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-config.patch" - "${FILESDIR}/${P}-makefile.patch" - "${FILESDIR}/${PN}-strchr.patch" -) - -pkg_setup() { - einfo "You can configure various build time options with ENV variables:" - einfo - einfo " PWAUTH_FAILLOG Path to logfile for login failures" - einfo " (default: /var/log/pwauth.log)" - einfo " PWAUTH_SERVERUIDS Comma seperated list of UIDs allowed to run pwauth" - einfo " (default: 81)" - einfo " PWAUTH_MINUID Minimum UID for which authentication will succeed" - einfo " (default: 1000)" - einfo - - PWAUTH_FAILLOG="${PWAUTH_FAILLOG:-/var/log/pwauth.log}" - PWAUTH_SERVERUIDS="${PWAUTH_SERVERUIDS:-81}" - PWAUTH_MINUID="${PWAUTH_MINUID:-1000}" - - append-cppflags "-DSERVER_UIDS=${PWAUTH_SERVERUIDS}" - append-cppflags "-DMIN_UNIX_UID=${PWAUTH_MINUID}" - - if use faillog; then - append-cppflags -DFAILLOG_PWAUTH - append-cppflags "-DPATH_FAILLOG=\"\\\"${PWAUTH_FAILLOG}\\\"\"" - fi - - if use pam; then - append-cppflags -DPAM - append-libs pam - else - append-cppflags -DSHADOW_SUN - append-libs crypt - fi - - use ignore-case && append-cppflags -DIGNORE_CASE - use domain-aware && append-cppflags -DOMAIN_AWARE -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dosbin pwauth unixgroup - fperms 4755 /usr/sbin/pwauth - - use pam && newpamd "${FILESDIR}"/pwauth.pam-include pwauth - - dodoc CHANGES FORM_AUTH INSTALL README -} diff --git a/www-apache/pwauth/pwauth-2.3.10-r2.ebuild b/www-apache/pwauth/pwauth-2.3.10-r2.ebuild new file mode 100644 index 000000000000..a99fff7b1ff0 --- /dev/null +++ b/www-apache/pwauth/pwauth-2.3.10-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic pam toolchain-funcs + +DESCRIPTION="A Unix Web Authenticator" +HOMEPAGE="https://github.com/phokz/pwauth/tree/master/pwauth" +SRC_URI="https://pwauth.googlecode.com/files/${P}.tar.gz" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="faillog pam ignore-case domain-aware" + +DEPEND="pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-config.patch" + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/${PN}-strchr.patch" + "${FILESDIR}/${P}-warnings.patch" + "${FILESDIR}/${P}-clang.patch" +) + +pkg_setup() { + einfo "You can configure various build time options with ENV variables:" + einfo + einfo " PWAUTH_FAILLOG Path to logfile for login failures" + einfo " (default: /var/log/pwauth.log)" + einfo " PWAUTH_SERVERUIDS Comma seperated list of UIDs allowed to run pwauth" + einfo " (default: 81)" + einfo " PWAUTH_MINUID Minimum UID for which authentication will succeed" + einfo " (default: 1000)" + einfo + + PWAUTH_FAILLOG="${PWAUTH_FAILLOG:-/var/log/pwauth.log}" + PWAUTH_SERVERUIDS="${PWAUTH_SERVERUIDS:-81}" + PWAUTH_MINUID="${PWAUTH_MINUID:-1000}" + + append-cppflags "-DSERVER_UIDS=${PWAUTH_SERVERUIDS}" + append-cppflags "-DMIN_UNIX_UID=${PWAUTH_MINUID}" + + if use faillog; then + append-cppflags -DFAILLOG_PWAUTH + append-cppflags "-DPATH_FAILLOG=\"\\\"${PWAUTH_FAILLOG}\\\"\"" + fi + + if use pam; then + append-cppflags -DPAM + append-libs pam + else + append-cppflags -DSHADOW_SUN + append-libs crypt + fi + + use ignore-case && append-cppflags -DIGNORE_CASE + use domain-aware && append-cppflags -DOMAIN_AWARE +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dosbin pwauth unixgroup + fperms 4755 /usr/sbin/pwauth + + use pam && newpamd "${FILESDIR}"/pwauth.pam-include pwauth + + dodoc CHANGES FORM_AUTH INSTALL README +} -- cgit v1.2.3