From 7a6195d91109344aadcc116c625947eb73bed88d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Jun 2018 14:11:43 +0200 Subject: [PATCH 1/9] Linux-PAM: Update version from 1.2.1 to 1.3.0 Systemd v237 requires at least Linux-PAM 1.3.0. Copy existing file from `/src/mariux/beeroot`. --- Linux-PAM-1.2.1-4.bee => Linux-PAM-1.3.0-0.bee | 1 + 1 file changed, 1 insertion(+) rename Linux-PAM-1.2.1-4.bee => Linux-PAM-1.3.0-0.bee (99%) diff --git a/Linux-PAM-1.2.1-4.bee b/Linux-PAM-1.3.0-0.bee similarity index 99% rename from Linux-PAM-1.2.1-4.bee rename to Linux-PAM-1.3.0-0.bee index 714e3f5b6..07e7cc62b 100755 --- a/Linux-PAM-1.2.1-4.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -39,4 +39,5 @@ mee_install() { for i in ${SYSCONFDIR}/environment ${SYSCONFDIR}/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} ; do mv -v ${D}${i}{,.sample} done + } From 6e8737fd10ddc407bd984e5c8bc3e42668207422 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:16:53 +0100 Subject: [PATCH 2/9] Linux-PAM: Strip trailing spaces --- Linux-PAM-1.3.0-0.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index 07e7cc62b..6160cc3a5 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -35,9 +35,9 @@ mee_install() { ln -s /lib/security/pam_gnome_keyring.so $D$LIBDIR/security/ # just samples, to not overwrite config - + for i in ${SYSCONFDIR}/environment ${SYSCONFDIR}/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} ; do mv -v ${D}${i}{,.sample} done - + } From 238cc54894b93719a422cd295f599c5ae27141c2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:17:06 +0100 Subject: [PATCH 3/9] Linux-PAM: Remove unneeded blank line --- Linux-PAM-1.3.0-0.bee | 1 - 1 file changed, 1 deletion(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index 6160cc3a5..f2bdbd93a 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -39,5 +39,4 @@ mee_install() { for i in ${SYSCONFDIR}/environment ${SYSCONFDIR}/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} ; do mv -v ${D}${i}{,.sample} done - } From d42f14fc645fd6c28e375b8809720817dfcf2dce Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:17:34 +0100 Subject: [PATCH 4/9] Linux-PAM: Put one configure option on each line --- Linux-PAM-1.3.0-0.bee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index f2bdbd93a..9debbd696 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -17,7 +17,8 @@ mee_patch() { } mee_configure() { - bee_configure --enable-read-both-confs + bee_configure \ + --enable-read-both-confs } mee_build() { From 3025834d92fb124bcd4752be697ce73017eaef06 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:17:55 +0100 Subject: [PATCH 5/9] Linux-PAM: Remove deprecated bee variable --- Linux-PAM-1.3.0-0.bee | 2 -- 1 file changed, 2 deletions(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index 9debbd696..2b7f22333 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -1,7 +1,5 @@ #!/bin/env beesh -PGRP=( core security ) - SRCURL[0]="http://linux-pam.org/library/Linux-PAM-${PKGVERSION}.tar.bz2" PATCHES[0]="" From 05cbbbe413865e3452814506489eb684cd24543e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:18:54 +0100 Subject: [PATCH 6/9] Linux-PAM: Use `PATCHURL` --- Linux-PAM-1.3.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index 2b7f22333..d10f63929 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -2,7 +2,7 @@ SRCURL[0]="http://linux-pam.org/library/Linux-PAM-${PKGVERSION}.tar.bz2" -PATCHES[0]="" +# PATCHURL+=() # EXCLUDE="" From f4f2098bc3602da00f975e60f823b722797781f1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:20:40 +0100 Subject: [PATCH 7/9] Linux-PAM: Comment out unchanged bee functions --- Linux-PAM-1.3.0-0.bee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM-1.3.0-0.bee index d10f63929..08cafcb20 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM-1.3.0-0.bee @@ -10,18 +10,18 @@ SRCURL[0]="http://linux-pam.org/library/Linux-PAM-${PKGVERSION}.tar.bz2" #LIBDIR=/lib INCLUDEDIR=/usr/include/security -mee_patch() { - bee_patch -} +#mee_patch() { +# bee_patch "${@}" +#} mee_configure() { bee_configure \ --enable-read-both-confs } -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} mee_install() { bee_install From 0b1133870c27bb917068f9457d2e4b756ba43bf7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:24:44 +0100 Subject: [PATCH 8/9] Linux-PAM: Convert to versionless bee file --- Linux-PAM-1.3.0-0.bee => Linux-PAM.be0 | 2 ++ 1 file changed, 2 insertions(+) rename Linux-PAM-1.3.0-0.bee => Linux-PAM.be0 (96%) diff --git a/Linux-PAM-1.3.0-0.bee b/Linux-PAM.be0 similarity index 96% rename from Linux-PAM-1.3.0-0.bee rename to Linux-PAM.be0 index 08cafcb20..f269abe4e 100755 --- a/Linux-PAM-1.3.0-0.bee +++ b/Linux-PAM.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION Linux-PAM-1.3.0-0 + SRCURL[0]="http://linux-pam.org/library/Linux-PAM-${PKGVERSION}.tar.bz2" # PATCHURL+=() From ca033ca8ae2aa6a982dcdb80350834f09ba9e5c4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Feb 2018 19:26:09 +0100 Subject: [PATCH 9/9] Linux-PAM: Do not use CrackLib On 02/26/18 12:44, Donald Buczek wrote: > I request `--disable-cracklib` configuration, because I am about to > remove cracklib. > > The reason is, that cracklib provides some python bindings which would > be obsolete when we upgrade python. To redo cracklib without the > python bindings would be some work, because the package has changed a > lot (e.g. no more inline wordlists provided). I wanted to save the > effort, because we don't currently use it anyway. --- Linux-PAM.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Linux-PAM.be0 b/Linux-PAM.be0 index f269abe4e..e38a27127 100755 --- a/Linux-PAM.be0 +++ b/Linux-PAM.be0 @@ -18,7 +18,8 @@ INCLUDEDIR=/usr/include/security mee_configure() { bee_configure \ - --enable-read-both-confs + --enable-read-both-confs \ + --disable-cracklib } #mee_build() {