diff options
13 files changed, 7 insertions, 140 deletions
diff --git a/packages/base-passwd/base-passwd-3.5.9/configure.patch b/packages/base-passwd/base-passwd-3.5.9/configure.patch deleted file mode 100644 index a9adb1e9e2..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/configure.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- base-passwd/configure.in~configure -+++ base-passwd/configure.in -@@ -1,5 +1,6 @@ - dnl Initialize the autoconf process --AC_INIT(update-passwd.c) -+AC_INIT -+AC_CONFIG_SRCDIR([update-passwd.c]) - AC_CONFIG_HEADER(config.h) - AC_PREFIX_DEFAULT(/usr) - -@@ -12,5 +13,6 @@ - AC_CHECK_FUNCS(putgrent) - - dnl Finally output everything --AC_OUTPUT(Makefile) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT - diff --git a/packages/base-passwd/base-passwd-3.5.9/mysql.patch b/packages/base-passwd/base-passwd-3.5.9/mysql.patch deleted file mode 100644 index b641f41238..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/mysql.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200 -+++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200 -@@ -36,4 +36,5 @@ - staff:*:50: - games:*:60: - users:*:100: -+mysql:*:64001: - nogroup:*:65534: diff --git a/packages/base-passwd/base-passwd-3.5.9/nobash.patch b/packages/base-passwd/base-passwd-3.5.9/nobash.patch deleted file mode 100644 index 2bde9bf33b..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/nobash.patch +++ /dev/null @@ -1,13 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- base-passwd/passwd.master~nobash -+++ base-passwd/passwd.master -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/bash -+root::0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch deleted file mode 100644 index 85d96b6185..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/root-home.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 -+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root::0:0:root:/home/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README deleted file mode 100644 index 1abe54b5a2..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/slugos/README +++ /dev/null @@ -1,14 +0,0 @@ -This patch overrides the root-home.patch for all DISTROs -derived from slugos (DISTROs which set slugos in OVERRIDES) - -The patch sets a root password on /etc/passwd, this password is - -opeNSLUg - -This allows ssh (dropbear) login to an OpenSlug NSLU2 using that -password. - -The password is NO MORE SECURE than the previous empty string, -however, because ssh logins can now succeed the NSLU2 is LESS -secure! This password must be changed as soon as possible after -initial configuration of the NSLU2. diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch deleted file mode 100644 index 97dab68f33..0000000000 --- a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 -+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/packages/base-passwd/base-passwd_3.5.19.bb b/packages/base-passwd/base-passwd_3.5.20.bb index 65ee129e0b..78079a0aa6 100644 --- a/packages/base-passwd/base-passwd_3.5.19.bb +++ b/packages/base-passwd/base-passwd_3.5.20.bb @@ -2,17 +2,16 @@ DESCRIPTION = "Base system password/group files." SECTION = "base" LICENSE = "GPL" -SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://nobash.patch;patch=1 \ - file://root-home.patch;patch=1 \ - file://mysql.patch;patch=1" - +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ + file://nobash.patch;patch=1 \ + file://root-home.patch;patch=1 \ + file://mysql.patch;patch=1 \ +" S = "${WORKDIR}/base-passwd" inherit autotools -FILES_${PN}-doc += "${docdir}" - do_install () { install -d -m 755 ${D}${sbindir} install -p -m 755 update-passwd ${D}${sbindir}/ @@ -42,6 +41,7 @@ do_install_append_openmn() { echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master } +FILES_${PN}-doc += "${docdir}" pkg_postinst () { set -e diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb deleted file mode 100644 index 4ea4e7f839..0000000000 --- a/packages/base-passwd/base-passwd_3.5.9.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Base system password/group files." -SECTION = "base" -PR = "r3" -LICENSE = "GPL" - -SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://nobash.patch;patch=1 \ - file://root-home.patch;patch=1 \ - file://mysql.patch;patch=1" - -S = "${WORKDIR}/base-passwd" - -inherit autotools - -FILES_${PN}-doc += "${docdir}" - -do_install () { - install -d -m 755 ${D}${sbindir} - install -p -m 755 update-passwd ${D}${sbindir}/ - install -d -m 755 \ - ${D}${mandir}/man8 ${D}${mandir}/pl/man8 - install -p -m 644 man/update-passwd.8 \ - ${D}${mandir}/man8/ - install -p -m 644 man/update-passwd.pl.8 \ - ${D}${mandir}/pl/man8/update-passwd.8 - gzip -9 ${D}${mandir}/man8/* \ - ${D}${mandir}/pl/man8/* - install -d -m 755 ${D}${datadir}/base-passwd - install -p -m 644 passwd.master \ - ${D}${datadir}/base-passwd/ - install -p -m 644 group.master \ - ${D}${datadir}/base-passwd/ - - install -d -m 755 ${D}${docdir}/${PN} - install -p -m 644 debian/changelog ${D}${docdir}/${PN}/ - gzip -9 ${D}${docdir}/${PN}/* - install -p -m 644 README ${D}${docdir}/${PN}/ - install -p -m 644 debian/copyright ${D}${docdir}/${PN}/ -} - - -do_install_append_openmn() { - echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master -} - - -pkg_postinst () { - set -e - - if [ ! -e $D${sysconfdir}/passwd ] ; then - cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd - fi - - if [ ! -e $D${sysconfdir}/group ] ; then - cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group - fi - exit 0 -} diff --git a/packages/base-passwd/base-passwd-3.5.19/mysql.patch b/packages/base-passwd/files/mysql.patch index b641f41238..b641f41238 100644 --- a/packages/base-passwd/base-passwd-3.5.19/mysql.patch +++ b/packages/base-passwd/files/mysql.patch diff --git a/packages/base-passwd/base-passwd-3.5.19/nobash.patch b/packages/base-passwd/files/nobash.patch index 2bde9bf33b..2bde9bf33b 100644 --- a/packages/base-passwd/base-passwd-3.5.19/nobash.patch +++ b/packages/base-passwd/files/nobash.patch diff --git a/packages/base-passwd/base-passwd-3.5.19/root-home.patch b/packages/base-passwd/files/root-home.patch index 85d96b6185..85d96b6185 100644 --- a/packages/base-passwd/base-passwd-3.5.19/root-home.patch +++ b/packages/base-passwd/files/root-home.patch diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/README b/packages/base-passwd/files/slugos/README index 1abe54b5a2..1abe54b5a2 100644 --- a/packages/base-passwd/base-passwd-3.5.19/slugos/README +++ b/packages/base-passwd/files/slugos/README diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch b/packages/base-passwd/files/slugos/root-home.patch index 97dab68f33..97dab68f33 100644 --- a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch +++ b/packages/base-passwd/files/slugos/root-home.patch |