1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

libpam: Upgrade 1.3.0 -> 1.3.1

Remove patch applied upstream.
Upstream tarball location changed.

(From OE-Core rev: 40b1825a4434334f3513f94775b176545f8d2f3a)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Bunk
2019-05-20 19:30:52 +03:00
committed by Richard Purdie
parent 5690aa952a
commit 707c0830c6
2 changed files with 3 additions and 232 deletions
@@ -1,226 +0,0 @@
From 555407ff6e2f742df64ae93859f14a0fc1397829 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Fri, 12 Sep 2014 05:35:05 -0400
Subject: [PATCH] libpam/xtests: remove bash dependency
There's not bash specific syntax in the xtest scripts:
# after below patches applied:
$ cd Linux-PAM-1.1.6/xtests
$ checkbashisms *.sh
No output
Just remove the runtime dependency to bash.
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
xtests/run-xtests.sh | 2 +-
xtests/tst-pam_access1.sh | 2 +-
xtests/tst-pam_access2.sh | 2 +-
xtests/tst-pam_access3.sh | 2 +-
xtests/tst-pam_access4.sh | 2 +-
xtests/tst-pam_assemble_line1.sh | 2 +-
xtests/tst-pam_group1.sh | 2 +-
xtests/tst-pam_limits1.sh | 2 +-
xtests/tst-pam_pwhistory1.sh | 2 +-
xtests/tst-pam_substack1.sh | 2 +-
xtests/tst-pam_substack2.sh | 2 +-
xtests/tst-pam_substack3.sh | 2 +-
xtests/tst-pam_substack4.sh | 2 +-
xtests/tst-pam_substack5.sh | 2 +-
xtests/tst-pam_succeed_if1.sh | 2 +-
xtests/tst-pam_unix1.sh | 2 +-
xtests/tst-pam_unix2.sh | 2 +-
xtests/tst-pam_unix3.sh | 2 +-
xtests/tst-pam_unix4.sh | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh
index 3a89057..1cf8684 100755
--- a/xtests/run-xtests.sh
+++ b/xtests/run-xtests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
SRCDIR=$1
shift 1
diff --git a/xtests/tst-pam_access1.sh b/xtests/tst-pam_access1.sh
index 180d256..70521d2 100755
--- a/xtests/tst-pam_access1.sh
+++ b/xtests/tst-pam_access1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/groupadd tstpamaccess
/usr/sbin/useradd -G tstpamaccess -p '!!' tstpamaccess1
diff --git a/xtests/tst-pam_access2.sh b/xtests/tst-pam_access2.sh
index 0a30275..7e3e60f 100755
--- a/xtests/tst-pam_access2.sh
+++ b/xtests/tst-pam_access2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/groupadd tstpamaccess
/usr/sbin/useradd -p '!!' tstpamaccess2
diff --git a/xtests/tst-pam_access3.sh b/xtests/tst-pam_access3.sh
index 348e0c3..3630e2e 100755
--- a/xtests/tst-pam_access3.sh
+++ b/xtests/tst-pam_access3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd -p '!!' tstpamaccess3
./tst-pam_access3
diff --git a/xtests/tst-pam_access4.sh b/xtests/tst-pam_access4.sh
index 61e7b44..4538df4 100755
--- a/xtests/tst-pam_access4.sh
+++ b/xtests/tst-pam_access4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd -p '!!' tstpamaccess4
./tst-pam_access4
diff --git a/xtests/tst-pam_assemble_line1.sh b/xtests/tst-pam_assemble_line1.sh
index 248d47e..dc2a675 100755
--- a/xtests/tst-pam_assemble_line1.sh
+++ b/xtests/tst-pam_assemble_line1.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authfail tst-pam_assemble_line1
diff --git a/xtests/tst-pam_group1.sh b/xtests/tst-pam_group1.sh
index b76377f..44faca9 100755
--- a/xtests/tst-pam_group1.sh
+++ b/xtests/tst-pam_group1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/groupadd tstpamgrpg
/usr/sbin/useradd -p '!!' tstpamgrp
diff --git a/xtests/tst-pam_limits1.sh b/xtests/tst-pam_limits1.sh
index 4faa822..32c021d 100755
--- a/xtests/tst-pam_limits1.sh
+++ b/xtests/tst-pam_limits1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd -p '!!' tstpamlimits
./tst-pam_limits1
diff --git a/xtests/tst-pam_pwhistory1.sh b/xtests/tst-pam_pwhistory1.sh
index ddb3b8b..0f212e2 100644
--- a/xtests/tst-pam_pwhistory1.sh
+++ b/xtests/tst-pam_pwhistory1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd tstpampwhistory
./tst-pam_pwhistory1
diff --git a/xtests/tst-pam_substack1.sh b/xtests/tst-pam_substack1.sh
index 5260175..f1b72a7 100755
--- a/xtests/tst-pam_substack1.sh
+++ b/xtests/tst-pam_substack1.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authfail tst-pam_substack1
diff --git a/xtests/tst-pam_substack2.sh b/xtests/tst-pam_substack2.sh
index c02f597..3804fa7 100755
--- a/xtests/tst-pam_substack2.sh
+++ b/xtests/tst-pam_substack2.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authsucceed tst-pam_substack2
diff --git a/xtests/tst-pam_substack3.sh b/xtests/tst-pam_substack3.sh
index 0e572aa..aa48e8e 100755
--- a/xtests/tst-pam_substack3.sh
+++ b/xtests/tst-pam_substack3.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authsucceed tst-pam_substack3
diff --git a/xtests/tst-pam_substack4.sh b/xtests/tst-pam_substack4.sh
index a3ef08a..958a07a 100755
--- a/xtests/tst-pam_substack4.sh
+++ b/xtests/tst-pam_substack4.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authsucceed tst-pam_substack4
diff --git a/xtests/tst-pam_substack5.sh b/xtests/tst-pam_substack5.sh
index e2714fd..7e0da74 100755
--- a/xtests/tst-pam_substack5.sh
+++ b/xtests/tst-pam_substack5.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
exec ./tst-pam_authfail tst-pam_substack5
diff --git a/xtests/tst-pam_succeed_if1.sh b/xtests/tst-pam_succeed_if1.sh
index a643b2e..58e57b4 100755
--- a/xtests/tst-pam_succeed_if1.sh
+++ b/xtests/tst-pam_succeed_if1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd -p '!!' tstpamtest
/usr/sbin/useradd -p '!!' pamtest
diff --git a/xtests/tst-pam_unix1.sh b/xtests/tst-pam_unix1.sh
index f75bd84..72deac0 100755
--- a/xtests/tst-pam_unix1.sh
+++ b/xtests/tst-pam_unix1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
/usr/sbin/useradd -p '!!' tstpamunix
./tst-pam_unix1
diff --git a/xtests/tst-pam_unix2.sh b/xtests/tst-pam_unix2.sh
index 7093155..c04d6e6 100755
--- a/xtests/tst-pam_unix2.sh
+++ b/xtests/tst-pam_unix2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# pamunix0 = 0aXKZztA.d1KY
/usr/sbin/useradd -p 0aXKZztA.d1KY tstpamunix
diff --git a/xtests/tst-pam_unix3.sh b/xtests/tst-pam_unix3.sh
index ef4a07c..b52db2b 100755
--- a/xtests/tst-pam_unix3.sh
+++ b/xtests/tst-pam_unix3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# pamunix01 = 0aXKZztA.d1KYIuFXArmd2jU
/usr/sbin/useradd -p 0aXKZztA.d1KYIuFXArmd2jU tstpamunix
diff --git a/xtests/tst-pam_unix4.sh b/xtests/tst-pam_unix4.sh
index 787c2f9..e7976fd 100755
--- a/xtests/tst-pam_unix4.sh
+++ b/xtests/tst-pam_unix4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# pamunix01 = 0aXKZztA.d1KYIuFXArmd2jU
/usr/sbin/useradd -p 0aXKZztA.d1KYIuFXArmd2jU tstpamunix
--
1.7.9.5
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \
file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \
"
SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \
file://99_pam \
file://pam.d/common-account \
file://pam.d/common-auth \
@@ -23,12 +23,11 @@ SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
file://fixsepbuild.patch \
file://pam-security-abstract-securetty-handling.patch \
file://pam-unix-nullok-secure.patch \
file://libpam-xtests-remove-bash-dependency.patch \
file://crypt_configure.patch \
"
SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a"
SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb"
SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165"
SRC_URI[sha256sum] = "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db"
SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \
file://include_paths_header.patch \
@@ -45,8 +44,6 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \
CFLAGS_append = " -fPIC "
PR = "r5"
S = "${WORKDIR}/Linux-PAM-${PV}"
inherit autotools gettext pkgconfig