packages: util-linux-ng/util-linux-diet.patch, util-linux-ng/util-linux-hot...
arekm
arekm at pld-linux.org
Thu Feb 10 12:54:07 CET 2011
Author: arekm Date: Thu Feb 10 11:54:07 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.19; needs crypt detection fix
---- Files affected:
packages/util-linux-ng:
util-linux-diet.patch (1.1 -> 1.2) , util-linux-hotkeys.patch (1.2 -> 1.3) , util-linux-ng.spec (1.81 -> 1.82) , util-linux-procpartitions.patch (1.3 -> 1.4) , util-linux-info.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/util-linux-ng/util-linux-diet.patch
diff -u packages/util-linux-ng/util-linux-diet.patch:1.1 packages/util-linux-ng/util-linux-diet.patch:1.2
--- packages/util-linux-ng/util-linux-diet.patch:1.1 Thu Aug 26 12:41:11 2010
+++ packages/util-linux-ng/util-linux-diet.patch Thu Feb 10 12:54:02 2011
@@ -1,23 +1,9 @@
---- util-linux-ng-2.18/shlibs/mount/src/utils.c~ 2010-06-07 11:44:06.000000000 +0200
-+++ util-linux-ng-2.18/shlibs/mount/src/utils.c 2010-08-26 11:10:06.142572779 +0200
-@@ -298,7 +298,11 @@
- {
- struct passwd pwd;
- struct passwd *res;
-+#ifndef __dietlibc__
- size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
-+#else
-+ size_t sz = 16384;
-+#endif
- char *buf, *username = NULL;
-
- if (sz <= 0)
--- util-linux-ng-2.18/shlibs/mount/src/fs.c~ 2010-06-08 10:44:20.000000000 +0200
+++ util-linux-ng-2.18/shlibs/mount/src/fs.c 2010-08-26 11:12:31.326572794 +0200
@@ -17,6 +17,9 @@
- #include <ctype.h>
#include <errno.h>
#include <blkid.h>
+ #include <stddef.h>
+#ifdef __dietlibc__
+#include <sys/stat.h> /* for major and minor macros */
+#endif
@@ -27,9 +13,9 @@
--- util-linux-ng-2.18/shlibs/mount/src/tab_parse.c~ 2010-06-07 12:35:06.000000000 +0200
+++ util-linux-ng-2.18/shlibs/mount/src/tab_parse.c 2010-08-26 11:16:35.762572782 +0200
@@ -9,6 +9,9 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <limits.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+#ifdef __dietlibc__
+#include <sys/stat.h> /* for makedev macro */
+#endif
@@ -47,12 +33,12 @@
#endif /* !HAVE_WIDECHAR */
#define is_last_column(_tb, _cl) \
---- util-linux-ng-2.18/lib/strtosize.c~ 2010-06-07 11:55:53.000000000 +0200
-+++ util-linux-ng-2.18/lib/strtosize.c 2010-08-26 12:17:37.199875281 +0200
-@@ -26,6 +26,9 @@
- #include <inttypes.h>
- #include <ctype.h>
- #include <errno.h>
+--- util-linux-2.19/lib/strutils.c~ 2011-01-31 16:43:47.000000000 +0100
++++ util-linux-2.19/lib/strutils.c 2011-02-10 12:49:12.221843465 +0100
+@@ -12,6 +12,9 @@
+ #include <sys/stat.h>
+ #include <locale.h>
+ #include <string.h>
+#ifdef __dietlibc__
+#include <stdint.h>
+#endif
================================================================
Index: packages/util-linux-ng/util-linux-hotkeys.patch
diff -u packages/util-linux-ng/util-linux-hotkeys.patch:1.2 packages/util-linux-ng/util-linux-hotkeys.patch:1.3
--- packages/util-linux-ng/util-linux-hotkeys.patch:1.2 Sun May 9 12:56:05 2010
+++ packages/util-linux-ng/util-linux-hotkeys.patch Thu Feb 10 12:54:02 2011
@@ -11,17 +11,6 @@
#: login-utils/wall.c:104
#, c-format
---- util-linux-ng-2.17.2/po/da.po.orig 2010-05-09 12:43:26.534940098 +0200
-+++ util-linux-ng-2.17.2/po/da.po 2010-05-09 12:43:32.174935908 +0200
-@@ -7705,7 +7705,7 @@
- #: login-utils/vipw.c:352
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "Vil du redigere %s nu [j/n]? "
-+msgstr "Vil du redigere %s nu [y/n]? "
-
- #: login-utils/wall.c:112
- #, c-format
--- util-linux-ng-2.17.2/po/de.po.orig 2010-05-09 12:46:21.882940098 +0200
+++ util-linux-ng-2.17.2/po/de.po 2010-05-09 12:46:26.774938422 +0200
@@ -7945,7 +7945,7 @@
================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.81 packages/util-linux-ng/util-linux-ng.spec:1.82
--- packages/util-linux-ng/util-linux-ng.spec:1.81 Tue Aug 31 16:37:04 2010
+++ packages/util-linux-ng/util-linux-ng.spec Thu Feb 10 12:54:02 2011
@@ -28,12 +28,12 @@
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux-ng
-Version: 2.18
-Release: 5
+Version: 2.19
+Release: 0.1
License: GPL
Group: Applications/System
-Source0: http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 2f5f71e6af969d041d73ab778c141a77
+Source0: http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.19/util-linux-%{version}.tar.bz2
+# Source0-md5: 590ca71aad0b254e2631d84401f28255
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
@@ -45,7 +45,6 @@
Patch3: util-linux-fdformat-ide.patch
Patch4: util-linux-fhs.patch
Patch5: util-linux-hotkeys.patch
-Patch6: util-linux-info.patch
Patch7: util-linux-login-lastlog.patch
Patch8: util-linux-procpartitions.patch
Patch9: util-linux-swaponsymlink.patch
@@ -611,14 +610,13 @@
etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
%prep
-%setup -q -a1
+%setup -q -a1 -n util-linux-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -1405,6 +1403,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.82 2011/02/10 11:54:02 arekm
+- up to 2.19; needs crypt detection fix
+
Revision 1.81 2010/08/31 14:37:04 glen
- br am 1.10
================================================================
Index: packages/util-linux-ng/util-linux-procpartitions.patch
diff -u packages/util-linux-ng/util-linux-procpartitions.patch:1.3 packages/util-linux-ng/util-linux-procpartitions.patch:1.4
--- packages/util-linux-ng/util-linux-procpartitions.patch:1.3 Mon May 24 19:45:10 2010
+++ packages/util-linux-ng/util-linux-procpartitions.patch Thu Feb 10 12:54:02 2011
@@ -30,9 +30,9 @@
unsigned long long sz;
+ char iobuf[32*1024];
- procpt = fopen(PROC_PARTITIONS, "r");
+ procpt = fopen(_PATH_PROC_PARTITIONS, "r");
if (procpt == NULL) {
- fprintf(stderr, _("cannot open %s\n"), PROC_PARTITIONS);
+ fprintf(stderr, _("cannot open %s\n"), _PATH_PROC_PARTITIONS);
return;
}
+ setvbuf(procpt, iobuf, _IOFBF, sizeof(iobuf));
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-diet.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-hotkeys.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.81&r2=1.82&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-procpartitions.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list