Skip to contentSkip to conversation

Recipe upgrades: sudo, libpam, and mtools

PATCH In review Scott Garman 2 participants 6 messages Nov 24, 2010 – Dec 2, 2010

lore
Share & tools
lore
#0 lore raw

cover Recipe upgrades: sudo, libpam, and mtools

Hi Saul,

Here are a few distro recipe upgrades. Some things to note:

* The version of mtools we have had to date is a GPLv2 version, so I left that recipe as-is and added the latest release, which is GPLv3.
* I've added source checksums, LIC_FILES_CHKSUM, and SUMMARY fields where needed, etc.
* I was able to remove obsolete patches from sudo and libpam after doing close verification.
* I have successfully built these on all of our nightly-release qemu machine arches - build testing should be solid. I also verfied the output of the final packages to check for missing files or other significant changes.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: sgarman/recipe-upgrades
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades

Thanks,
Scott Garman <[email protected]>
---

Scott Garman (4):
sudo: upgrade to version 1.7.4p4
libpam: upgrade to version 1.1.3
mtools: add version 4.0.15 distro_tracking_fields.inc: update sudo, libpam, and mtools

 .../conf/distro/include/distro_tracking_fields.inc |   31 +++--
 .../mtools/mtools/no-x11.gplv3.patch               |   15 ++
 meta/recipes-devtools/mtools/mtools_4.0.15.bb      |   21 +++
 .../pam/libpam-1.1.1/disable_crossbinary.patch     |   34 -----
 .../pam/{libpam-1.1.1 => libpam}/99_pam            |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-account  |    0
 .../pam/{libpam-1.1.1 => libpam}/pam.d/common-auth |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-password |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-session  |    0
 .../pam.d/common-session-noninteractive            |    0
 .../pam/{libpam-1.1.1 => libpam}/pam.d/other       |    0
 .../pam/{libpam_1.1.1.bb => libpam_1.1.3.bb}       |   12 ++-
 meta/recipes-extended/sudo/files/autofoo.patch     |  143 --------------------
 meta/recipes-extended/sudo/files/libtool.patch     |   20 +++
 meta/recipes-extended/sudo/files/noexec-link.patch |   17 ---
 meta/recipes-extended/sudo/files/nostrip.patch     |   23 ---
 meta/recipes-extended/sudo/site/bit-32             |    2 -
 meta/recipes-extended/sudo/site/bit-64             |    2 -
 meta/recipes-extended/sudo/sudo.inc                |   21 ++--
 meta/recipes-extended/sudo/sudo_1.7.2p7.bb         |    7 -
 meta/recipes-extended/sudo/sudo_1.7.4p4.bb         |   11 ++
 21 files changed, 102 insertions(+), 257 deletions(-)
 create mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
 create mode 100644 meta/recipes-devtools/mtools/mtools_4.0.15.bb
 delete mode 100644 meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/99_pam (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-account (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-auth (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-password (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session-noninteractive (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/other (100%)
 rename meta/recipes-extended/pam/{libpam_1.1.1.bb => libpam_1.1.3.bb} (89%)
 delete mode 100644 meta/recipes-extended/sudo/files/autofoo.patch
 create mode 100644 meta/recipes-extended/sudo/files/libtool.patch
 delete mode 100644 meta/recipes-extended/sudo/files/noexec-link.patch
 delete mode 100644 meta/recipes-extended/sudo/files/nostrip.patch
 delete mode 100644 meta/recipes-extended/sudo/site/bit-32
 delete mode 100644 meta/recipes-extended/sudo/site/bit-64
 delete mode 100644 meta/recipes-extended/sudo/sudo_1.7.2p7.bb
 create mode 100644 meta/recipes-extended/sudo/sudo_1.7.4p4.bb
#1 lore raw

PATCH 1/4 sudo: upgrade to version 1.7.4p4

* Upgraded sudo to v1.7.4p4
* Removed obsolete patches
* Makefile.in no longer strips binaries, removed do_configure_prepend() section which used to remove the -s
* Updated HOMEPAGE to canonical URL for project
* Added SUMMARY field
* Added checksums for source tarball
* Added patch for correcting paths to libtool scripts in m4/
* Corrected typos in LIC_FILES_CHKSUM (use of startline was invalid) and included updated checksums - no license text has actually changed

---
 meta/recipes-extended/sudo/files/autofoo.patch     |  143 --------------------
 meta/recipes-extended/sudo/files/libtool.patch     |   20 +++
 meta/recipes-extended/sudo/files/noexec-link.patch |   17 ---
 meta/recipes-extended/sudo/files/nostrip.patch     |   23 ---
 meta/recipes-extended/sudo/site/bit-32             |    2 -
 meta/recipes-extended/sudo/site/bit-64             |    2 -
 meta/recipes-extended/sudo/sudo.inc                |   21 ++--
 meta/recipes-extended/sudo/sudo_1.7.2p7.bb         |    7 -
 meta/recipes-extended/sudo/sudo_1.7.4p4.bb         |   11 ++
 9 files changed, 40 insertions(+), 206 deletions(-)
 delete mode 100644 meta/recipes-extended/sudo/files/autofoo.patch
 create mode 100644 meta/recipes-extended/sudo/files/libtool.patch
 delete mode 100644 meta/recipes-extended/sudo/files/noexec-link.patch
 delete mode 100644 meta/recipes-extended/sudo/files/nostrip.patch
 delete mode 100644 meta/recipes-extended/sudo/site/bit-32
 delete mode 100644 meta/recipes-extended/sudo/site/bit-64
 delete mode 100644 meta/recipes-extended/sudo/sudo_1.7.2p7.bb
 create mode 100644 meta/recipes-extended/sudo/sudo_1.7.4p4.bb
meta/recipes-extended/sudo/files/autofoo.patch deleted +0 -143
deleted file mode 100644
index 4f24737..0000000
@@ -1,143 +0,0 @@
-# fix underquotes, rebased to 1.7.2p7
-#
-# by Kevin Tian <[email protected]>, 06/23/2010
-Index: sudo-1.7.2p7/aclocal.m4
-===================================================================
---- sudo-1.7.2p7.orig/aclocal.m4	2010-06-23 13:33:57.000000000 +0800
-+++ sudo-1.7.2p7/aclocal.m4	2010-06-23 13:36:41.000000000 +0800
-@@ -10,7 +10,7 @@
- dnl
- dnl check for sendmail
- dnl
--AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail)
-+AC_DEFUN([SUDO_PROG_SENDMAIL], [AC_MSG_CHECKING(for sendmail)
- if test -f "/usr/sbin/sendmail"; then
-     AC_MSG_RESULT(/usr/sbin/sendmail)
-     SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/sbin/sendmail")
-@@ -37,7 +37,7 @@
- dnl
- dnl check for vi
- dnl
--AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING(for vi)
-+AC_DEFUN([SUDO_PROG_VI], [AC_MSG_CHECKING(for vi)
- if test -f "/usr/bin/vi"; then
-     AC_MSG_RESULT(/usr/bin/vi)
-     SUDO_DEFINE(_PATH_VI, "/usr/bin/vi")
-@@ -61,7 +61,7 @@
- dnl
- dnl check for mv
- dnl
--AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING(for mv)
-+AC_DEFUN([SUDO_PROG_MV], [AC_MSG_CHECKING(for mv)
- if test -f "/usr/bin/mv"; then
-     AC_MSG_RESULT(/usr/bin/mv)
-     SUDO_DEFINE(_PATH_MV, "/usr/bin/mv")
-@@ -82,7 +82,7 @@
- dnl
- dnl check for bourne shell
- dnl
--AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING(for bourne shell)
-+AC_DEFUN([SUDO_PROG_BSHELL], [AC_MSG_CHECKING(for bourne shell)
- if test -f "/bin/sh"; then
-     AC_MSG_RESULT(/bin/sh)
-     SUDO_DEFINE(_PATH_BSHELL, "/bin/sh")
-@@ -115,7 +115,7 @@
- dnl
- dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
- dnl
--AC_DEFUN(SUDO_LOGFILE, [AC_MSG_CHECKING(for log file location)
-+AC_DEFUN([SUDO_LOGFILE], [AC_MSG_CHECKING(for log file location)
- if test -n "$with_logpath"; then
-     AC_MSG_RESULT($with_logpath)
-     SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath")
-@@ -136,7 +136,7 @@
- dnl
- dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
- dnl
--AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location)
-+AC_DEFUN([SUDO_TIMEDIR], [AC_MSG_CHECKING(for timestamp file location)
- if test -n "$with_timedir"; then
-     AC_MSG_RESULT($with_timedir)
-     SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$with_timedir")
-@@ -160,7 +160,7 @@
- dnl SUDO_CHECK_TYPE(TYPE, DEFAULT)
- dnl XXX - should require the check for unistd.h...
- dnl
--AC_DEFUN(SUDO_CHECK_TYPE,
-+AC_DEFUN([SUDO_CHECK_TYPE],
- [AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_MSG_CHECKING(for $1)
- AC_CACHE_VAL(sudo_cv_type_$1,
-@@ -181,31 +181,31 @@
- dnl
- dnl Check for size_t declation
- dnl
--AC_DEFUN(SUDO_TYPE_SIZE_T,
-+AC_DEFUN([SUDO_TYPE_SIZE_T],
- [SUDO_CHECK_TYPE(size_t, int)])
- 
- dnl
- dnl Check for ssize_t declation
- dnl
--AC_DEFUN(SUDO_TYPE_SSIZE_T,
-+AC_DEFUN([SUDO_TYPE_SSIZE_T],
- [SUDO_CHECK_TYPE(ssize_t, int)])
- 
- dnl
- dnl Check for dev_t declation
- dnl
--AC_DEFUN(SUDO_TYPE_DEV_T,
-+AC_DEFUN([SUDO_TYPE_DEV_T],
- [SUDO_CHECK_TYPE(dev_t, int)])
- 
- dnl
- dnl Check for ino_t declation
- dnl
--AC_DEFUN(SUDO_TYPE_INO_T,
-+AC_DEFUN([SUDO_TYPE_INO_T],
- [SUDO_CHECK_TYPE(ino_t, unsigned int)])
- 
- dnl
- dnl check for working fnmatch(3)
- dnl
--AC_DEFUN(SUDO_FUNC_FNMATCH,
-+AC_DEFUN([SUDO_FUNC_FNMATCH],
- [AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD])
- AC_CACHE_VAL(sudo_cv_func_fnmatch,
- [rm -f conftestdata; > conftestdata
-@@ -271,7 +271,7 @@
- dnl
- dnl check for sa_len field in struct sockaddr
- dnl
--AC_DEFUN(SUDO_SOCK_SA_LEN,
-+AC_DEFUN([SUDO_SOCK_SA_LEN],
- [AC_MSG_CHECKING(for sa_len field in struct sockaddr)
- AC_CACHE_VAL(sudo_cv_sock_sa_len,
- [AC_TRY_RUN([#include <sys/types.h>
-@@ -294,7 +294,7 @@
- dnl we can't really trust UID_MAX or MAXUID since they may exist
- dnl only for backwards compatibility.
- dnl
--AC_DEFUN(SUDO_UID_T_LEN,
-+AC_DEFUN([SUDO_UID_T_LEN],
- [AC_REQUIRE([AC_TYPE_UID_T])
- AC_MSG_CHECKING(max length of uid_t)
- AC_CACHE_VAL(sudo_cv_uid_t_len,
-@@ -327,7 +327,7 @@
- dnl
- dnl Check for presence of long long and for sizeof(long long) == sizeof(long)
- dnl
--AC_DEFUN(SUDO_TYPE_LONG_LONG,
-+AC_DEFUN([SUDO_TYPE_LONG_LONG],
- [AC_CHECK_TYPES(long long, [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.])]
- [AC_MSG_CHECKING(for long and long long equivalence)
- AC_CACHE_VAL(sudo_cv_type_long_is_quad,
-@@ -347,7 +347,7 @@
- dnl
- dnl append a libpath to an LDFLAGS style variable
- dnl
--AC_DEFUN(SUDO_APPEND_LIBPATH, [
-+AC_DEFUN([SUDO_APPEND_LIBPATH], [
-     if test X"$with_rpath" = X"yes"; then
- 	case "$host" in
- 	    *-*-hpux*)	$1="${$1} -L$2 -Wl,+b,$2"
meta/recipes-extended/sudo/files/libtool.patch new file +20 -0
new file mode 100644
index 0000000..2375fc6
@@ -0,0 +1,20 @@
+# Fix path to libtool scripts so autoreconf can succeed.
+#
+# Signed-off-by: Scott Garman <[email protected]>
+diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4
+--- sudo-1.7.4p4.orig//aclocal.m4	2010-08-06 07:17:36.000000000 -0700
++++ sudo-1.7.4p4//aclocal.m4	2010-11-22 14:38:20.360957038 -0800
+@@ -368,8 +368,8 @@
+ dnl
+ dnl Pull in libtool macros
+ dnl
+-m4_include([libtool.m4])
+-m4_include([ltoptions.m4])
+-m4_include([ltsugar.m4])
+-m4_include([ltversion.m4])
+-m4_include([lt~obsolete.m4])
++m4_include([m4/libtool.m4])
++m4_include([m4/ltoptions.m4])
++m4_include([m4/ltsugar.m4])
++m4_include([m4/ltversion.m4])
++m4_include([m4/lt~obsolete.m4])
meta/recipes-extended/sudo/files/noexec-link.patch deleted +0 -17
deleted file mode 100644
index e0d35d0..0000000
@@ -1,17 +0,0 @@
-# libtool requires library's name to start with 'lib', or else error is reported. with "-module" option
-# that check is skipped
-#
-# comments added by Kevin Tian <[email protected]>, 06/23/2010
-Index: sudo-1.6.8p6/Makefile.in
-===================================================================
---- sudo-1.6.8p6.orig/Makefile.in	2005-01-21 19:09:26.963276656 -0500
-+++ sudo-1.6.8p6/Makefile.in	2005-01-21 19:16:11.918714072 -0500
-@@ -187,7 +187,7 @@
- 	$(CC) -o $@ $(TESTOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS)
- 
- sudo_noexec.la: sudo_noexec.lo
--	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -module -rpath $(noexecdir)
- 
- # Uncomment the following if you want "make distclean" to clean the parser
- @DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
meta/recipes-extended/sudo/files/nostrip.patch deleted +0 -23
deleted file mode 100644
index 3c71b4f..0000000
@@ -1,23 +0,0 @@
-# this could be pushed upstream to allowing conditional strip. Now it's not applied.
-# we use sed in recipe for same purpose. Keep here as reminder for upstream
-#
-# comment added by Kevin Tian <[email protected]>, 07/01/2010
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: sudo-1.6.8p5/Makefile.in
-===================================================================
---- sudo-1.6.8p5.orig/Makefile.in	2005-01-21 18:19:05.762568976 -0500
-+++ sudo-1.6.8p5/Makefile.in	2005-01-21 18:19:34.701169640 -0500
-@@ -307,8 +307,8 @@
- 	    $(DESTDIR)$(noexecdir)
- 
- install-binaries: $(PROGS)
--	$(INSTALL) $(install_owncmd) -m 4555 -s sudo $(DESTDIR)$(sudodir)/sudo
--	$(INSTALL) $(install_owncmd) -m 0555 -s visudo $(DESTDIR)$(visudodir)/visudo
-+	$(INSTALL) $(install_owncmd) -m 4555 sudo $(DESTDIR)$(sudodir)/sudo
-+	$(INSTALL) $(install_owncmd) -m 0555 visudo $(DESTDIR)$(visudodir)/visudo
- 	rm -f $(DESTDIR)$(sudodir)/sudoedit
- 	ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
- 
meta/recipes-extended/sudo/site/bit-32 deleted +0 -2
deleted file mode 100644
index 9b7ca5c..0000000
@@ -1,2 +0,0 @@
-# is sizeof(long long) == sizeof(long)
-sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=no}
meta/recipes-extended/sudo/site/bit-64 deleted +0 -2
deleted file mode 100644
index 05846ff..0000000
@@ -1,2 +0,0 @@
-# is sizeof(long long) == sizeof(long)
-sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=yes}
meta/recipes-extended/sudo/sudo.inc +9 -12
index 2add94b..1407bf1 100644
@@ -1,26 +1,23 @@
+SUMMARY = "Provide limited super user privileges to specific users"
 DESCRIPTION = "Sudo (superuser do) allows a system administrator to give certain users (or groups of users) the ability to run some (or all) commands as root while logging all commands and arguments."
-HOMEPAGE = "http://www.courtesan.com/sudo/"
+HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 PRIORITY = "optional"
 SECTION = "admin"
 LICENSE = "ISC & UCB & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a7dfe8895011d65d0c2e24aaf5ad0843 \
-                    file://nonunix.h;startline=4;endline=28;md5=1e70feedac93a3fd7f5254e3fec52677 \
-                    file://vasgroups.c;startline=4;endline=28;md5=1e70feedac93a3fd7f5254e3fec52677 \
-                    file://fnmatch.c;startline=6;endline=31;md5=0779058eafd6e23b966585b45bfa54f3 \
-                    file://getcwd.c;startline=5;endline=27;md5=08d82914995224a0ca42116d7ca2a218 \
-                    file://glob.c;startline=6;endline=31;md5=299cb38ec8d56e89118ce57fb83b4f78 \
-                    file://snprintf.c;startline=6;endline=31;md5=dabd56a89a7a773850dc06ee4f1ecde2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0b07397b2fca3fb8b71f08cd85c6eb3f \
+                    file://nonunix.h;beginline=4;endline=28;md5=af7d361f47ae60769cac77e4fca0dbb0 \
+                    file://vasgroups.c;beginline=4;endline=28;md5=af7d361f47ae60769cac77e4fca0dbb0 \
+                    file://fnmatch.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
+                    file://getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
+                    file://glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
+                    file://snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea"
 
 inherit autotools
 
 EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor"
 
 do_configure_prepend () {
-	# Prevent binaries from being stripped on the host
-	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
-
-	rm -f acsite.m4
 	if [ ! -e acinclude.m4 ]; then
 		cat aclocal.m4 > acinclude.m4
 	fi
meta/recipes-extended/sudo/sudo_1.7.2p7.bb deleted +0 -7
deleted file mode 100644
index 3dd6cdf..0000000
@@ -1,7 +0,0 @@
-PR = "r0"
-
-SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-1.7.2p7.tar.gz \
-           file://noexec-link.patch"
-
-require sudo.inc
-EXTRA_OECONF += " --with-pam=no"
meta/recipes-extended/sudo/sudo_1.7.4p4.bb new file +11 -0
new file mode 100644
index 0000000..ee81b65
@@ -0,0 +1,11 @@
+require sudo.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
+           file://libtool.patch"
+
+SRC_URI[md5sum] = "55d9906535d70a1de347cd3d3550ee87"
+SRC_URI[sha256sum] = "38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97"
+
+EXTRA_OECONF += " --with-pam=no"
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/4 libpam: upgrade to version 1.1.3

In reply to Scott Garman

* Removed obsolete crossbinary patch
* Added source checksums
* Added LIC_FILES_CHKSUM and SUMMARY entries

---
 .../pam/libpam-1.1.1/disable_crossbinary.patch     |   34 --------------------
 .../pam/{libpam-1.1.1 => libpam}/99_pam            |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-account  |    0
 .../pam/{libpam-1.1.1 => libpam}/pam.d/common-auth |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-password |    0
 .../{libpam-1.1.1 => libpam}/pam.d/common-session  |    0
 .../pam.d/common-session-noninteractive            |    0
 .../pam/{libpam-1.1.1 => libpam}/pam.d/other       |    0
 .../pam/{libpam_1.1.1.bb => libpam_1.1.3.bb}       |   12 +++++--
 9 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/99_pam (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-account (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-auth (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-password (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session-noninteractive (100%)
 rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/other (100%)
 rename meta/recipes-extended/pam/{libpam_1.1.1.bb => libpam_1.1.3.bb} (89%)
meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch deleted +0 -34
deleted file mode 100644
index 43359b0..0000000
@@ -1,34 +0,0 @@
-padout should be compiled using the native compiler but isn't. 
-Disable this piece of documentation for now.
-
-RP
-
-Index: Linux-PAM-1.0.2/doc/specs/Makefile.am
-===================================================================
---- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am	2008-11-04 21:06:23.000000000 +0000
-+++ Linux-PAM-1.0.2/doc/specs/Makefile.am	2008-11-04 21:07:06.000000000 +0000
-@@ -2,21 +2,8 @@
- # Copyright (c) 2005, 2006 Thorsten Kukuk <[email protected]>
- #
- 
--CLEANFILES = draft-morgan-pam-current.txt *~
-+CLEANFILES = *~
- 
--EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
-+EXTRA_DIST = std-agent-id.raw rfc86.0.txt
- 
--draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
--	./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt
--
--AM_YFLAGS = -d
--
--BUILT_SOURCES = parse_y.h
--
--noinst_PROGRAMS = padout
--
--padout_SOURCES = parse_l.l parse_y.y
--
--padout_LDADD = @LEXLIB@
--
--doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt
-+doc_DATA = rfc86.0.txt
meta/recipes-extended/pam/libpam/99_pam renamed from meta/recipes-extended/pam/libpam-1.1.1/99_pam +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/99_pam
rename to meta/recipes-extended/pam/libpam/99_pam
meta/recipes-extended/pam/libpam/pam.d/common-account renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account
rename to meta/recipes-extended/pam/libpam/pam.d/common-account
meta/recipes-extended/pam/libpam/pam.d/common-auth renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth
rename to meta/recipes-extended/pam/libpam/pam.d/common-auth
meta/recipes-extended/pam/libpam/pam.d/common-password renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password
rename to meta/recipes-extended/pam/libpam/pam.d/common-password
meta/recipes-extended/pam/libpam/pam.d/common-session renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session
rename to meta/recipes-extended/pam/libpam/pam.d/common-session
meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive
rename to meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
meta/recipes-extended/pam/libpam/pam.d/other renamed from meta/recipes-extended/pam/libpam-1.1.1/pam.d/other +0 -0
similarity index 100%
rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/other
rename to meta/recipes-extended/pam/libpam/pam.d/other
meta/recipes-extended/pam/libpam_1.1.3.bb renamed from meta/recipes-extended/pam/libpam_1.1.1.bb +9 -3
similarity index 89%
rename from meta/recipes-extended/pam/libpam_1.1.1.bb
rename to meta/recipes-extended/pam/libpam_1.1.3.bb
index 536a0f5..7a8b29a 100644
@@ -1,21 +1,27 @@
+SUMMARY = "Linux-PAM (Pluggable Authentication Modules)"
 DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), Basically, it is a flexible mechanism for authenticating users"
 HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/"
 BUGTRACKER = "http://sourceforge.net/projects/pam/support"
-# PAM allows dual licensed under GPL and BSD.
+SECTION = "base"
+# PAM is dual licensed under GPL and BSD.
 # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time 
 # libpam-runtime-1.0.1 is GPLv2+), by openembedded
 LICENSE = "GPLv2+ | BSD"
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
+
+PR = "r0"
 
 DEPENDS = "bison flex"
 RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix"
 RRECOMMENDS_${PN} = "libpam-runtime"
 
 SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
-           file://disable_crossbinary.patch \
            file://99_pam \
            file://pam.d/*"
 
+SRC_URI[md5sum] = "6db7fcb5db6253350e3a4648ceac40e7"
+SRC_URI[sha256sum] = "17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652"
+
 EXTRA_OECONF = "--with-db-uniquename=_pam \
                 --includedir=${includedir}/security \
                 --libdir=${base_libdir} \
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/4 mtools: add version 4.0.15

In reply to Scott Garman

This is the latest release of mtools, which is also GPLv3. Leaving the previous recipe as-is since it is GPLv2.

---
 .../mtools/mtools/no-x11.gplv3.patch               |   15 ++++++++++++++
 meta/recipes-devtools/mtools/mtools_4.0.15.bb      |   21 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
 create mode 100644 meta/recipes-devtools/mtools/mtools_4.0.15.bb
meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch new file +15 -0
new file mode 100644
index 0000000..7d1f545
@@ -0,0 +1,15 @@
+# Disable building with X11 support.
+#
+# Signed-off-by: Scott Garman <[email protected]>
+diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in
+--- mtools-4.0.15.orig//Makefile.in	2010-10-17 08:41:09.000000000 -0700
++++ mtools-4.0.15//Makefile.in	2010-11-23 13:59:49.258258374 -0800
+@@ -146,7 +146,7 @@
+ CXXFLAGS  = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
+ LINK      = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ ALLLIBS   = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
+-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS)
++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS)
+ X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
+ 
+ all:    mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5
meta/recipes-devtools/mtools/mtools_4.0.15.bb new file +21 -0
new file mode 100644
index 0000000..08f42cc
@@ -0,0 +1,21 @@
+SUMMARY = "Utilities to access MS-DOS disks without mounting them"
+DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them."
+HOMEPAGE = "http://www.gnu.org/software/mtools/"
+SECTION = "optional"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
+           file://mtools-makeinfo.patch \
+           file://no-x11.gplv3.patch"
+
+SRC_URI[md5sum] = "b7550b649af77812cb696a780e853f47"
+SRC_URI[sha256sum] = "290defca107cc183a17c98d3f7d00db02228b724084a2a818f1dd6ea86973899"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x"
+
+BBCLASSEXTEND = "native"
Signature · 1 line
1.7.1
#4 lore raw

PATCH 4/4 distro_tracking_fields.inc: update sudo, libpam, and mtools

In reply to Scott Garman
---
 .../conf/distro/include/distro_tracking_fields.inc |   31 +++++++++++---------
 1 files changed, 17 insertions(+), 14 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +17 -14
index 63bb126..5eadadd 100644
@@ -153,13 +153,12 @@ RECIPE_MAINTAINER_pn-glib-2.0 = "Dongxiao Xu <[email protected]>"
 RECIPE_STATUS_pn-libpam = "green"
 DISTRO_PN_ALIAS_pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam"
 DEPENDENCY_CHECK_pn-libpam = "not done"
-RECIPE_LATEST_VERSION_pn-libpam = "1.1.1"
-RECIPE_PATCH_pn-libpam+disable_crossbinary = "added by RP; 2008; padout requires native compilation and not used in the target. so disable it. local patch"
+RECIPE_LATEST_VERSION_pn-libpam = "1.1.3"
 RECIPE_INTEL_SECTION_pn-libpam = "base libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpam = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-libpam = "12/2009"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpam = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-libpam = "2010/10/28"
 RECIPE_COMMENTS_pn-libpam = ""
-RECIPE_MAINTAINER_pn-libpam = "Kevin Tian <[email protected]>"
+RECIPE_MAINTAINER_pn-libpam = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-libgpg-error = "yellow" # specific .pc handle
 DEPENDENCY_CHECK_pn-libgpg-error = "not done"
@@ -776,14 +775,12 @@ RECIPE_MAINTAINER_pn-pax-utils = "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-sudo = "green"
 DEPENDENCY_CHECK_pn-sudo = "not done"
-RECIPE_LATEST_VERSION_pn-sudo = "1.7.2p7"
-RECIPE_PATCH_pn-sudo+autofoo = "to be pushed upstream"
-RECIPE_PATCH_pn-sudo+noexec-link = "to be pushed upstream"
+RECIPE_LATEST_VERSION_pn-sudo = "1.7.4p4"
 RECIPE_INTEL_SECTION_pn-sudo = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "1 months"
-RECIPE_LATEST_RELEASE_DATE_pn-sudo = "06/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-sudo = "2010/09/07"
 RECIPE_COMMENTS_pn-sudo = ""
-RECIPE_MAINTAINER_pn-sudo = "Kevin Tian <[email protected]>"
+RECIPE_MAINTAINER_pn-sudo = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-blktool = "green"
 DEPENDENCY_CHECK_pn-blktool = "not done"
@@ -1189,9 +1186,15 @@ RECIPE_COMMENTS_pn-msynctool = ""
 RECIPE_MAINTAINER_pn-msynctool = "Dongxiao Xu <[email protected]>"
 DISTRO_PN_ALIAS_pn-msynctool = "OpenSuse=msynctool Mandriva=msynctool"
 
-RECIPE_STATUS_pn-mtools = "red"
-RECIPE_LATEST_VERSION_pn-mtools = "4.0.13"
-RECIPE_MAINTAINER_pn-mtools = "Kevin Tian <[email protected]>"
+RECIPE_STATUS_pn-mtools = "green"
+DEPENDENCY_CHECK_pn-mtools = "not done"
+RECIPE_LATEST_VERSION_pn-mtools = "4.0.15"
+RECIPE_INTEL_SECTION_pn-mtools = "optional"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mtools = "1 day"
+RECIPE_LATEST_RELEASE_DATE_pn-mtools = "2010/10/17"
+RECIPE_COMMENTS_pn-mtools = ""
+RECIPE_LATEST_VERSION_pn-mtools = "4.0.15"
+RECIPE_MAINTAINER_pn-mtools = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-pm-utils = "green"
 DEPENDENCY_CHECK_pn-pm-utils = "not done"
Signature · 1 line
1.7.1
#5 lore raw
In reply to Scott Garman
Quoted 72 lines · Scott Garman

Hi Saul,

Here are a few distro recipe upgrades. Some things to note:

* The version of mtools we have had to date is a GPLv2 version, so I left that recipe as-is and added the latest release, which is GPLv3.
* I've added source checksums, LIC_FILES_CHKSUM, and SUMMARY fields where needed, etc.
* I was able to remove obsolete patches from sudo and libpam after doing close verification.
* I have successfully built these on all of our nightly-release qemu machine arches - build testing should be solid. I also verfied the output of the final packages to check for missing files or other significant changes.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: sgarman/recipe-upgrades
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades

Thanks,
Scott Garman<[email protected]>
---

Scott Garman (4):
sudo: upgrade to version 1.7.4p4
libpam: upgrade to version 1.1.3
mtools: add version 4.0.15 distro_tracking_fields.inc: update sudo, libpam, and mtools

  .../conf/distro/include/distro_tracking_fields.inc |   31 +++--
  .../mtools/mtools/no-x11.gplv3.patch               |   15 ++
  meta/recipes-devtools/mtools/mtools_4.0.15.bb      |   21 +++
  .../pam/libpam-1.1.1/disable_crossbinary.patch     |   34 -----
  .../pam/{libpam-1.1.1 =>  libpam}/99_pam            |    0
  .../{libpam-1.1.1 =>  libpam}/pam.d/common-account  |    0
  .../pam/{libpam-1.1.1 =>  libpam}/pam.d/common-auth |    0
  .../{libpam-1.1.1 =>  libpam}/pam.d/common-password |    0
  .../{libpam-1.1.1 =>  libpam}/pam.d/common-session  |    0
  .../pam.d/common-session-noninteractive            |    0
  .../pam/{libpam-1.1.1 =>  libpam}/pam.d/other       |    0
  .../pam/{libpam_1.1.1.bb =>  libpam_1.1.3.bb}       |   12 ++-
  meta/recipes-extended/sudo/files/autofoo.patch     |  143 --------------------
  meta/recipes-extended/sudo/files/libtool.patch     |   20 +++
  meta/recipes-extended/sudo/files/noexec-link.patch |   17 ---
  meta/recipes-extended/sudo/files/nostrip.patch     |   23 ---
  meta/recipes-extended/sudo/site/bit-32             |    2 -
  meta/recipes-extended/sudo/site/bit-64             |    2 -
  meta/recipes-extended/sudo/sudo.inc                |   21 ++--
  meta/recipes-extended/sudo/sudo_1.7.2p7.bb         |    7 -
  meta/recipes-extended/sudo/sudo_1.7.4p4.bb         |   11 ++
  21 files changed, 102 insertions(+), 257 deletions(-)
  create mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
  create mode 100644 meta/recipes-devtools/mtools/mtools_4.0.15.bb
  delete mode 100644 meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/99_pam (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/common-account (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/common-auth (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/common-password (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/common-session (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/common-session-noninteractive (100%)
  rename meta/recipes-extended/pam/{libpam-1.1.1 =>  libpam}/pam.d/other (100%)

rename meta/recipes-extended/pam/{libpam_1.1.1.bb => libpam_1.1.3.bb} (89%) delete mode 100644 meta/recipes-extended/sudo/files/autofoo.patch create mode 100644 meta/recipes-extended/sudo/files/libtool.patch delete mode 100644 meta/recipes-extended/sudo/files/noexec-link.patch delete mode 100644 meta/recipes-extended/sudo/files/nostrip.patch delete mode 100644 meta/recipes-extended/sudo/site/bit-32 delete mode 100644 meta/recipes-extended/sudo/site/bit-64 delete mode 100644 meta/recipes-extended/sudo/sudo_1.7.2p7.bb create mode 100644 meta/recipes-extended/sudo/sudo_1.7.4p4.bb

Quoted 5 lines

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Pull into Master

Thanks
Sau!