packages: util-linux/util-linux-diet.patch, util-linux/util-linux-fhs.patch...

glen glen at pld-linux.org
Mon Mar 5 20:41:12 CET 2012 

Author: glen                         Date: Mon Mar  5 19:41:12 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.21; initrd build fails with finding -lcompat

---- Files affected:
packages/util-linux:
   util-linux-diet.patch (1.4 -> 1.5) , util-linux-fhs.patch (1.8 -> 1.9) , util-linux-login-lastlog.patch (1.3 -> 1.4) , util-linux-pl.po-update.patch (1.4 -> 1.5) , util-linux-swaponsymlink.patch (1.3 -> 1.4) , util-linux.spec (1.336 -> 1.337) , util-linux-ctrlaltdel-man.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/util-linux/util-linux-diet.patch
diff -u packages/util-linux/util-linux-diet.patch:1.4 packages/util-linux/util-linux-diet.patch:1.5
--- packages/util-linux/util-linux-diet.patch:1.4	Mon Aug 29 16:03:08 2011
+++ packages/util-linux/util-linux-diet.patch	Mon Mar  5 20:41:06 2012
@@ -34,32 +34,32 @@
  
  static int do_scale_by_power (uintmax_t *x, int base, int power)
  {
---- util-linux-2.19/libmount/src/utils.c~	2011-01-24 23:46:29.000000000 +0100
-+++ util-linux-2.19/libmount/src/utils.c	2011-02-10 20:12:00.499611392 +0100
-@@ -398,7 +398,11 @@
- 	int rc = -1;
-         struct passwd pwd;
- 	struct passwd *pw;
-+#ifdef _SC_GETPW_R_SIZE_MAX
- 	size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
-+#else
-+	size_t sz = 0;
-+#endif
- 	char *buf;
- 
- 	if (!username || !uid)
-@@ -427,7 +431,11 @@
- 	int rc = -1;
-         struct group grp;
- 	struct group *gr;
-+#ifdef _SC_GETGR_R_SIZE_MAX
- 	size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
-+#else
-+	size_t sz = 0;
-+#endif
- 	char *buf;
- 
- 	if (!groupname || !gid)
+#--- util-linux-2.19/libmount/src/utils.c~	2011-01-24 23:46:29.000000000 +0100
+#+++ util-linux-2.19/libmount/src/utils.c	2011-02-10 20:12:00.499611392 +0100
+#@@ -398,7 +398,11 @@
+# 	int rc = -1;
+#         struct passwd pwd;
+# 	struct passwd *pw;
+#+#ifdef _SC_GETPW_R_SIZE_MAX
+# 	size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
+#+#else
+#+	size_t sz = 0;
+#+#endif
+# 	char *buf;
+# 
+# 	if (!username || !uid)
+#@@ -427,7 +431,11 @@
+# 	int rc = -1;
+#         struct group grp;
+# 	struct group *gr;
+#+#ifdef _SC_GETGR_R_SIZE_MAX
+# 	size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
+#+#else
+#+	size_t sz = 0;
+#+#endif
+# 	char *buf;
+# 
+# 	if (!groupname || !gid)
 --- util-linux-2.19/lib/at.c~	2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/lib/at.c	2011-02-10 20:30:37.336797058 +0100
 @@ -7,6 +7,7 @@
@@ -99,17 +99,17 @@
  	if (inst->lock >= 0) {
  		int rc = -1;
  
---- util-linux-2.19/configure.ac~	2011-02-10 21:28:23.395401725 +0100
-+++ util-linux-2.19/configure.ac	2011-02-10 22:12:29.997898392 +0100
-@@ -188,6 +188,8 @@
+--- util-linux-2.21/configure.ac~	2012-02-24 12:53:35.000000000 +0200
++++ util-linux-2.21/configure.ac	2012-03-05 21:03:25.833675080 +0200
+@@ -263,6 +263,8 @@
  	lchown \
  	llseek \
  	lseek64 \
 +	mkostemp \
 +	versionsort \
+ 	scandirat \
  	strtoull \
  	sysconf \
- 	getdtablesize \
 --- util-linux-2.19/misc-utils/findfs.c~	2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/misc-utils/findfs.c	2011-02-10 22:24:39.615735924 +0100
 @@ -12,6 +12,7 @@
@@ -130,20 +130,20 @@
  #include "nls.h"
  
  #define SCRIPT_MIN_DELAY 0.0001		/* from original sripreplay.pl */
---- util-linux-2.19/libmount/src/tab_parse.c~	2011-02-10 23:28:02.091461025 +0100
-+++ util-linux-2.19/libmount/src/tab_parse.c	2011-02-10 23:29:04.934794359 +0100
-@@ -422,7 +422,13 @@
- 
- 	/* TODO: it would be nice to have a scandir() implementaion that
- 	 *       is able to use already opened directory */
--	n = scandir(dirname, &namelist, NULL, versionsort);
-+	n = scandir(dirname, &namelist, NULL,
+--- util-linux-2.21/libmount/src/tab_parse.c~	2012-03-05 21:00:14.000000000 +0200
++++ util-linux-2.21/libmount/src/tab_parse.c	2012-03-05 21:05:27.562569076 +0200
+@@ -524,7 +524,13 @@
+ 	DIR *dir = NULL;
+ 	struct dirent **namelist = NULL;
+ 
+-	n = scandir(dirname, &namelist, mnt_table_parse_dir_filter, versionsort);
++	n = scandir(dirname, &namelist, mnt_table_parse_dir_filter,
 +#ifdef HAVE_VERSIONSORT
-+			versionsort
++		versionsort
 +#else
-+			alphasort
++		alphasort
 +#endif
-+			);
++	);
  	if (n <= 0)
  		return 0;
  

================================================================
Index: packages/util-linux/util-linux-fhs.patch
diff -u packages/util-linux/util-linux-fhs.patch:1.8 packages/util-linux/util-linux-fhs.patch:1.9
--- packages/util-linux/util-linux-fhs.patch:1.8	Thu Feb 10 23:44:39 2011
+++ packages/util-linux/util-linux-fhs.patch	Mon Mar  5 20:41:06 2012
@@ -1,6 +1,6 @@
---- util-linux-ng-2.17.2/include/pathnames.h.orig	2010-03-22 09:05:42.000000000 +0100
-+++ util-linux-ng-2.17.2/include/pathnames.h	2010-05-09 10:46:42.934937584 +0200
-@@ -20,12 +20,12 @@
+--- util-linux-2.21/include/pathnames.h~	2011-12-18 22:28:28.000000000 +0200
++++ util-linux-2.21/include/pathnames.h	2012-03-05 17:32:49.986673893 +0200
+@@ -26,13 +26,13 @@
  #define	_PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
  
  #define _PATH_SECURETTY		"/etc/securetty"
@@ -8,6 +8,7 @@
 +#define _PATH_WTMPLOCK		"/var/lock/wtmplock"
  
  #define	_PATH_HUSHLOGIN		".hushlogin"
+ #define	_PATH_HUSHLOGINS	"/etc/hushlogins"
  
  #ifndef _PATH_MAILDIR
 -#define	_PATH_MAILDIR		"/var/spool/mail"
@@ -15,3 +16,14 @@
  #endif
  #define	_PATH_MOTDFILE		"/etc/motd"
  #define	_PATH_NOLOGIN		"/etc/nologin"
+--- util-linux-2.21/login-utils/login.1~	2012-02-10 15:45:52.000000000 +0200
++++ util-linux-2.21/login-utils/login.1	2012-03-05 18:07:04.386917212 +0200
+@@ -223,7 +223,7 @@
+ .I /var/run/utmp
+ .I /var/log/wtmp
+ .I /var/log/lastlog
+-.I /var/spool/mail/*
++.I /var/mail/*
+ .I /etc/motd
+ .I /etc/passwd
+ .I /etc/nologin

================================================================
Index: packages/util-linux/util-linux-login-lastlog.patch
diff -u packages/util-linux/util-linux-login-lastlog.patch:1.3 packages/util-linux/util-linux-login-lastlog.patch:1.4
--- packages/util-linux/util-linux-login-lastlog.patch:1.3	Thu Feb 10 23:44:39 2011
+++ packages/util-linux/util-linux-login-lastlog.patch	Mon Mar  5 20:41:06 2012
@@ -1,11 +1,11 @@
---- util-linux-ng-2.17.2/login-utils/login.c.orig	2010-03-18 23:11:23.000000000 +0100
-+++ util-linux-ng-2.17.2/login-utils/login.c	2010-05-09 11:42:42.890935908 +0200
-@@ -1431,7 +1431,7 @@
-     struct lastlog ll;
-     int fd;
+--- util-linux-2.21/login-utils/login.c~	2012-02-10 16:16:07.000000000 +0200
++++ util-linux-2.21/login-utils/login.c	2012-03-05 17:33:34.932052369 +0200
+@@ -503,7 +503,7 @@
+ 	if (!cxt->pwd)
+ 		return;
+ 
+-	fd = open(_PATH_LASTLOG, O_RDWR, 0);
++	fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0);
+ 	if (fd < 0)
+ 		return;
  
--    if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
-+    if ((fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0)) >= 0) {
- 	lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
- 	if (!quiet) {
- 	    if (read(fd, (char *)&ll, sizeof(ll)) == sizeof(ll) &&

================================================================
Index: packages/util-linux/util-linux-pl.po-update.patch
diff -u packages/util-linux/util-linux-pl.po-update.patch:1.4 packages/util-linux/util-linux-pl.po-update.patch:1.5
--- packages/util-linux/util-linux-pl.po-update.patch:1.4	Sat Dec  3 08:58:03 2011
+++ packages/util-linux/util-linux-pl.po-update.patch	Mon Mar  5 20:41:06 2012
@@ -1,54 +1,11 @@
---- util-linux-2.20.1/po/pl.po.orig	2011-10-20 10:13:15.000000000 +0200
-+++ util-linux-2.20.1/po/pl.po	2011-12-03 08:40:19.058372761 +0100
-@@ -6,10 +6,10 @@
- #
- msgid ""
+--- util-linux-2.21/po/pl.po~	2012-02-24 12:35:23.000000000 +0200
++++ util-linux-2.21/po/pl.po	2012-03-05 21:36:38.404584366 +0200
+@@ -13376,7 +13376,7 @@
+ " -3, --3gb                limits the used address space to a maximum of 3 "
+ "GB\n"
+ "     --4gb                ignored (for backward compatibility only)\n"
+-"     --uname-2.6          turns on UNAME26\n"
++"     --uname-2.6          w³±czenie UNAME26\n"
  msgstr ""
--"Project-Id-Version: util-linux 2.20-rc2\n"
-+"Project-Id-Version: util-linux 2.20.1\n"
- "Report-Msgid-Bugs-To: util-linux at vger.kernel.org\n"
- "POT-Creation-Date: 2011-10-20 10:13+0200\n"
--"PO-Revision-Date: 2011-08-20 21:22+0200\n"
-+"PO-Revision-Date: 2011-12-03 08:35+0100\n"
- "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
- "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -5499,12 +5499,12 @@
- msgstr "Uwaga: partycje %s i %s zachodz± na siebie\n"
- 
- #: fdisk/sfdisk.c:1260
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Warning: partition %s contains part of the partition table (sector %llu),\n"
- "and will destroy it when filled\n"
- msgstr ""
--"Uwaga: partycja %s zawiera czê¶æ tablicy partycji (sektor %lu)\n"
-+"Uwaga: partycja %s zawiera czê¶æ tablicy partycji (sektor %llu)\n"
- "i zostanie zniszczona po jej wype³nieniu\n"
- 
- #: fdisk/sfdisk.c:1273
-@@ -11524,13 +11524,12 @@
- " -v, --verbose       wypisanie liczby usuniêtych bajtów\n"
- 
- #: sys-utils/fstrim.c:66
--#, fuzzy
- msgid ""
- "\n"
- "For more information see fstrim(8).\n"
- msgstr ""
- "\n"
--"Wiêcej informacji w fstrim(1).\n"
-+"Wiêcej informacji w fstrim(8).\n"
- 
- #: sys-utils/fstrim.c:102
- #, c-format
-@@ -12899,7 +12898,7 @@
- #: sys-utils/setarch.c:137
- #, c-format
- msgid "     --uname-2.6          turns on UNAME26\n"
--msgstr ""
-+msgstr "     --uname-2.6          w³±czenie UNAME26\n"
- 
- #: sys-utils/setarch.c:139
- #, c-format
+ " -v, --verbose            szczegó³owa informacja o w³±czanych opcjach\n"
+ " -R, --addr-no-randomize  wy³±czenie losowo¶ci wirtualnej przestrzeni "

================================================================
Index: packages/util-linux/util-linux-swaponsymlink.patch
diff -u packages/util-linux/util-linux-swaponsymlink.patch:1.3 packages/util-linux/util-linux-swaponsymlink.patch:1.4
--- packages/util-linux/util-linux-swaponsymlink.patch:1.3	Thu Feb 10 23:44:39 2011
+++ packages/util-linux/util-linux-swaponsymlink.patch	Mon Mar  5 20:41:06 2012
@@ -2,8 +2,8 @@
 /etc/fstab may not match /proc/swaps. That
 means strcmp shouldn't be used for swapon.
 
---- util-linux-2.12p/mount/swapon.c.sopwith	Wed Dec 22 04:50:19 2004
-+++ util-linux-2.12p/mount/swapon.c	Thu Dec 23 14:44:49 2004
+--- util-linux-2.12p/sys-utils/swapon.c.sopwith	Wed Dec 22 04:50:19 2004
++++ util-linux-2.12p/sys-utils/swapon.c	Thu Dec 23 14:44:49 2004
 @@ -138,9 +138,19 @@
  is_in_proc_swaps(const char *fname) {
  	int i;

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.336 packages/util-linux/util-linux.spec:1.337
--- packages/util-linux/util-linux.spec:1.336	Wed Jan 18 21:55:46 2012
+++ packages/util-linux/util-linux.spec	Mon Mar  5 20:41:06 2012
@@ -1,4 +1,14 @@
 # $Revision$, $Date$
+# TODO
+# - follow readprofile.1 -> redprofile.8 change in translated manuals as well
+#   /sbin/chcpu
+#   /sbin/raw
+#   /usr/bin/prlimit
+#   /usr/share/getopt/getopt-parse.bash
+#   /usr/share/getopt/getopt-parse.tcsh
+#   /usr/share/man/man1/prlimit.1.gz
+#   /usr/share/man/man8/chcpu.8.gz
+#   /usr/share/man/man8/raw.8.gz
 #
 # Conditional build:
 %bcond_with	uClibc		# link initrd version with static glibc instead of uClibc
@@ -30,13 +40,12 @@
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
-Version:	2.20.1
-Release:	4
+Version:	2.21
+Release:	0.3
 License:	GPL
 Group:		Applications/System
-#Source0:	http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2
-Source0:	ftp://ftp.infradead.org/pub/util-linux/v2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	079b37517fd4e002a2e6e992e8b4e361
+Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.21/%{name}-%{version}.tar.xz
+# Source0-md5:	208aa058f4117759d2939d1be7d662fc
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:	login.pamd
@@ -45,7 +54,6 @@
 Source5:	blockdev.upstart
 Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-ng-union-mount.patch
-Patch2:		%{name}-ctrlaltdel-man.patch
 Patch3:		%{name}-fdformat-ide.patch
 Patch4:		%{name}-fhs.patch
 Patch5:		%{name}-hotkeys.patch
@@ -54,7 +62,8 @@
 Patch9:		%{name}-swaponsymlink.patch
 Patch10:	%{name}-diet.patch
 Patch11:	no-openat.patch
-Patch12:	%{name}-build.patch
+Patch12:	https://github.com/karelzak/util-linux/commit/2f595c001b4528b3b9a4aea04d72b6918c434efb.patch
+# Patch12-md5:	6671ea54ea50f49ef56e05a7b3c8bd37
 URL:		http://userweb.kernel.org/~kzak/util-linux/
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
@@ -72,6 +81,8 @@
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	zlib-devel
 %if %{with initrd}
 	%if %{with uClibc}
@@ -626,7 +637,6 @@
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -690,7 +700,7 @@
 		LDFLAGS="-lcompat"
 	%endif
 	# empty line required because there is a backslash up there
-	%{__make} -C $dir install DESTDIR=`pwd`/initrd
+	%{__make} -C $dir install DESTDIR=$(pwd)/initrd
 done
 
 %{__make} clean
@@ -725,8 +735,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__sed} -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1
-
 %if %{with partx}
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
 %endif
@@ -827,7 +835,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc */README.* text-utils/LICENSE.pg NEWS
+%doc */README.* NEWS
 
 %attr(755,root,root) /sbin/clock
 %attr(755,root,root) /sbin/hwclock*
@@ -962,7 +970,6 @@
 %{_mandir}/man1/more.1*
 %{_mandir}/man1/namei.1*
 %{_mandir}/man1/pg.1*
-%{_mandir}/man1/readprofile.1*
 %{_mandir}/man1/renice.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/rename.1*
@@ -990,6 +997,7 @@
 %{_mandir}/man8/isosize.8*
 %{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/mkswap.8*
+%{_mandir}/man8/readprofile.8*
 %{_mandir}/man8/rtcwake.8*
 %{_mandir}/man8/swaplabel.8*
 %if "%{pld_release}" != "ac"
@@ -1432,6 +1440,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.337  2012/03/05 19:41:06  glen
+- up to 2.21; initrd build fails with finding -lcompat
+
 Revision 1.336  2012/01/18 20:55:46  glen
 - comment about C: nfs-utils-common < 1.1.3-3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-diet.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-fhs.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-login-lastlog.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-pl.po-update.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-swaponsymlink.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.336&r2=1.337&f=u

More information about the pld-cvs-commit mailing list