July 2010 - openSUSE Commits - openSUSE Mailing Lists

commit dbus-1 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at Fri Jul 30 12:45:49 CEST 2010. -------- --- dbus-1/dbus-1-x11.changes 2010-07-14 00:59:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1/dbus-1-x11.changes 2010-07-24 10:16:39.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 24 10:15:42 CEST 2010 - kay.sievers(a)novell.com + +- update systemd service installation + +------------------------------------------------------------------- dbus-1.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.iYmI9G/_old 2010-07-30 12:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.iYmI9G/_new 2010-07-30 12:44:59.000000000 +0200 @@ -29,7 +29,7 @@ BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel Version: 1.3.2 -Release: 1 +Release: 2 AutoReqProv: on # bug437293 %ifarch ppc64 ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.iYmI9G/_old 2010-07-30 12:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.iYmI9G/_new 2010-07-30 12:44:59.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel Version: 1.3.2 -Release: 1 +Release: 2 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -169,12 +169,14 @@ %preun %{stop_on_removal dbus} -/usr/bin/systemd-install --realize=reload disable dbus.service >/dev/null 2>&1 || : +if [ "$1" -eq 0 ]; then + /bin/systemctl disable dbus.service >/dev/null 2>&1 || : +fi %post /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} -/usr/bin/systemd-install --realize=reload enable dbus.service >/dev/null 2>&1 || : +/bin/systemctl enable dbus.service >/dev/null 2>&1 || : /sbin/ldconfig %{run_permissions} %verifyscript ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit unzip for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package unzip for openSUSE:Factory checked in at Fri Jul 30 12:45:29 CEST 2010. -------- --- unzip/unzip.changes 2010-05-11 13:37:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/unzip/unzip.changes 2010-06-25 18:34:00.000000000 +0200 @@ -1,0 +2,49 @@ +Fri Jun 25 18:21:34 CEST 2010 - pth(a)suse.de + +- Doing open(O_WRONLY) and then fdopen("w+") will now fail with + "Invalid Argument" whereas former glibcs would succeed. So now + do open(O_RDWR). +- Print error message when open(2) fails. +- Add debugging traces in open_outfile. + +------------------------------------------------------------------- +Fri May 21 16:39:24 CEST 2010 - pth(a)suse.de + +- Update to 6.0: + * Support PKWARE ZIP64 extensions, allowing Zip archives and Zip archive + entries larger than 4 GiBytes and more than 65536 entries within a + single Zip archive. This support is currently only available for Unix, + OpenVMS and Win32/Win64. + * Support for bzip2 compression method. + * Support for UTF-8 encoded entry names, both through PKWARE's "General + Purpose Flags Bit 11" indicator and Info-ZIP's new "up" unicode path + extra field. (Currently, on Windows the UTF-8 handling is limited to + the character subset contained in the configured non-unicode "system + code page".) + * Fixed "Time of Creation/Time of Use" vulnerability when setting + attributes of extracted files, for Unix and Unix-like ports. + * Fixed memory leak when processing invalid deflated data. + * Fixed long-standing bug in unshrink (partial_clear), added boundary + checks against invalid compressed data. + * On Unix, keep inherited SGID attribute bit for extracted directories + unless restoration of owner/group id or SUID/SGID/Tacky attributes was + requested. + * On Unix, allow extracted filenames to contain embedded control + characters when explicitly requested by specifying the new command line + option "-^". + * On Unix, support restoration of symbolic link attributes. + * On Unix, support restoration of 32-bit UID/GID data using the new "ux" + IZUNIX3 extra field introduced with Zip 3.0. + * Support symbolic links zipped up on VMS. + * New -D option to suppress restoration of timestamps for extracted + directory entries (on those ports that support setting of directory + timestamps). By specifying "-DD", this new option also allows to + suppress timestamp restoration for ALL extracted files on all UnZip + ports which support restoration of timestamps. On VMS, the default + behaviour is now to skip restoration of directory timestamps; here, + "--D" restores ALL timestamps, "-D" restores none. + * On OS/2, Win32, and Unix, the (previously optional) feature UNIXBACKUP + to allow saving backup copies of overwritten files on extraction is now + enabled by default. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- unzip-5.5.2-goo-sec.patch unzip-CVE-2005-2475.patch unzip-near-4GB.patch unzip552.tar.bz2 New: ---- unzip60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unzip.spec ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package unzip (Version 5.52) +# spec file for package unzip (Version 6.00) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,20 +23,18 @@ Provides: crunzip Obsoletes: crunzip AutoReqProv: on -Version: 5.52 -Release: 144 +Version: 6.00 +Release: 1 +%define fileversion 60 Summary: A program to unpack compressed files -Source: unzip552.tar.bz2 +Source: %{name}%{fileversion}.tar.bz2 Url: http://www.info-zip.org/ -Patch: unzip.dif +Patch0: unzip.dif Patch1: unzip-iso8859_2.patch Patch3: unzip-optflags.patch Patch4: unzip-5.52-filename_too_long.patch Patch5: unzip-no_file_name_translation.patch -Patch6: unzip-near-4GB.patch -Patch7: unzip-CVE-2005-2475.patch Patch8: unzip-open_missing_mode.patch -Patch9: unzip-5.5.2-goo-sec.patch Patch10: unzip-5.52-use_librcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: librcc-devel @@ -55,20 +53,17 @@ Info-ZIP <zip-bugs(a)lists.wku.edu> %prep -%setup -q -%patch -p1 -%patch1 -p1 +%setup -q -n %{name}%{fileversion} +%patch0 +%patch1 %patch3 %patch4 %patch5 -%patch6 -%patch7 %patch8 -%patch9 %patch10 %build -export RPM_OPT_FLAGS="%optflags -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fstack-protector" +export RPM_OPT_FLAGS="%optflags -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -fstack-protector -I." make %{?jobs:-j%jobs} -f unix/Makefile LF2=-lrcc linux_noasm %install ++++++ unzip-5.52-filename_too_long.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,17 +1,17 @@ ---- process.c -+++ process.c -@@ -156,8 +156,8 @@ +Index: process.c +=================================================================== +--- process.c.orig 2009-03-06 02:25:10.000000000 +0100 ++++ process.c 2010-05-21 13:17:28.292590863 +0200 +@@ -203,6 +203,8 @@ static ZCONST char Far Cent64EndSigSearc + #endif static ZCONST char Far ZipfileCommTrunc1[] = "\ncaution: zipfile comment truncated\n"; - -- -- +static ZCONST char Far FileNameTooLong[] = + "%s: error: %s (truncated): %s\n"; - - /*******************************/ - /* Function process_zipfiles() */ -@@ -314,6 +314,17 @@ + #ifndef NO_ZIPINFO + static ZCONST char Far NoZipfileComment[] = + "There is no zipfile comment.\n"; +@@ -390,6 +392,17 @@ int process_zipfiles(__G) /* return P lastzipfn = G.zipfn; ++++++ unzip-5.52-use_librcc.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -4,7 +4,7 @@ Index: dsrecode.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dsrecode.c 2010-05-10 18:00:17.972091018 +0200 ++++ dsrecode.c 2010-05-21 14:25:19.192590879 +0200 @@ -0,0 +1,137 @@ +#include <librcc.h> + @@ -145,9 +145,9 @@ +} Index: fileio.c =================================================================== ---- fileio.c.orig 2010-05-10 18:00:17.912090858 +0200 -+++ fileio.c 2010-05-10 18:00:17.976090793 +0200 -@@ -78,7 +78,7 @@ +--- fileio.c.orig 2010-05-21 14:25:19.172590765 +0200 ++++ fileio.c 2010-05-21 14:25:19.192590879 +0200 +@@ -82,7 +82,7 @@ # endif #endif #include "ebcdic.h" /* definition/initialization of ebcdic[] */ @@ -158,9 +158,9 @@ Note: Under Windows, the maximum size of the buffer that can be used Index: unzpriv.h =================================================================== ---- unzpriv.h.orig 2010-05-10 18:00:17.848090721 +0200 -+++ unzpriv.h 2010-05-10 18:00:18.016090830 +0200 -@@ -2582,10 +2582,11 @@ char *GetLoadPath OF((__GPRO)); +--- unzpriv.h.orig 2010-05-21 14:24:55.632590821 +0200 ++++ unzpriv.h 2010-05-21 14:25:19.220590722 +0200 +@@ -3025,10 +3025,11 @@ char *GetLoadPath OF((__GPRO)); !(((islochdr) || (isuxatt)) && \ ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \ (hostnum) == FS_HPFS_ || \ ++++++ unzip-iso8859_2.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,6 +1,8 @@ ---- unzip-5.52/ebcdic.h -+++ unzip-5.52/ebcdic.h -@@ -254,6 +254,25 @@ +Index: ebcdic.h +=================================================================== +--- ebcdic.h.orig 2008-03-21 13:04:22.000000000 +0100 ++++ ebcdic.h 2010-05-21 14:07:51.000091055 +0200 +@@ -254,6 +254,25 @@ ZCONST uch Far iso2oem_850[] = { 0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6, /* F0 - F7 */ 0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98 /* F8 - FF */ }; @@ -26,7 +28,7 @@ #endif /* IZ_ISO2OEM_ARRAY */ #ifdef IZ_OEM2ISO_ARRAY -@@ -275,8 +294,28 @@ +@@ -275,6 +294,25 @@ ZCONST uch Far oem2iso_850[] = { 0xAD, 0xB1, 0x3D, 0xBE, 0xB6, 0xA7, 0xF7, 0xB8, /* F0 - F7 */ 0xB0, 0xA8, 0xB7, 0xB9, 0xB3, 0xB2, 0xA6, 0xA0 /* F8 - FF */ }; @@ -51,22 +53,21 @@ +}; #endif /* IZ_OEM2ISO_ARRAY */ -+ - #if defined(THEOS) || defined(THEOS_SUPPORT) - # include "theos/charconv.h" - #endif ---- unzip-5.52/man/unzip.1 -+++ unzip-5.52/man/unzip.1 + /* The following pointers to the OEM<-->ISO translation tables are used +Index: man/unzip.1 +=================================================================== +--- man/unzip.1.orig 2009-04-20 02:33:10.000000000 +0200 ++++ man/unzip.1 2010-05-21 14:23:25.824590928 +0200 @@ -25,7 +25,7 @@ unzip \- list, test and extract compressed files in a ZIP archive .PD .SH SYNOPSIS --\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMVWX$/:\fP]] -+\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMOVX$/:\fP]] +-\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCDKLMUVWX$/:^\fP]] ++\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCDKLMOUVWX$/:^\fP]] \fIfile\fP[\fI.zip\fP] [\fIfile(s)\fP\ .\|.\|.] [\fB\-x\fP\ \fIxfile(s)\fP\ .\|.\|.] [\fB\-d\fP\ \fIexdir\fP] .PD -@@ -342,6 +342,9 @@ +@@ -386,6 +386,9 @@ of \fIzip\fP(1L), which stores filenotes overwrite existing files without prompting. This is a dangerous option, so use it with care. (It is often used with \fB\-f\fP, however, and is the only way to overwrite directory EAs under OS/2.) @@ -76,9 +77,11 @@ .IP \fB\-P\fP\ \fIpassword\fP use \fIpassword\fP to decrypt encrypted zipfile entries (if any). \fBTHIS IS INSECURE!\fP Many multi-user operating systems provide ways for any user to ---- unzip-5.52/unzip.c -+++ unzip-5.52/unzip.c -@@ -1327,6 +1327,12 @@ +Index: unzip.c +=================================================================== +--- unzip.c.orig 2009-04-16 20:26:52.000000000 +0200 ++++ unzip.c 2010-05-21 14:23:25.824590928 +0200 +@@ -1592,6 +1592,12 @@ int uz_opts(__G__ pargc, pargv) } else ++uO.overwrite_all; break; @@ -91,9 +94,11 @@ case ('p'): /* pipes: extract to stdout, no messages */ if (negative) { uO.cflag = FALSE; ---- unzip-5.52/unzip.h -+++ unzip-5.52/unzip.h -@@ -462,6 +462,7 @@ +Index: unzip.h +=================================================================== +--- unzip.h.orig 2009-02-15 19:12:54.000000000 +0100 ++++ unzip.h 2010-05-21 14:23:25.824590928 +0200 +@@ -502,6 +502,7 @@ typedef struct _UzpOpts { int K_flag; /* -K: keep setuid/setgid/tacky permissions */ #endif int lflag; /* -12slmv: listing format (zipinfo) */ @@ -101,15 +106,17 @@ int L_flag; /* -L: convert filenames from some OSes to lowercase */ int overwrite_none; /* -n: never overwrite files (no prompting) */ #ifdef AMIGA ---- unzip-5.52/unzpriv.h -+++ unzip-5.52/unzpriv.h -@@ -2456,8 +2456,15 @@ +Index: unzpriv.h +=================================================================== +--- unzpriv.h.orig 2009-04-20 01:59:26.000000000 +0200 ++++ unzpriv.h 2010-05-21 14:24:02.641090783 +0200 +@@ -2899,8 +2899,15 @@ char *GetLoadPath OF((__GPRO)); # define IZ_ISO2OEM_ARRAY # endif - # define _ISO_INTERN(str1) {register uch *p;\ + # define _ISO_INTERN(str1) if (iso2oem) {register uch *p;\ - for (p=(uch *)(str1); *p; p++)\ - *p = native((*p & 0x80) ? iso2oem[*p & 0x7f] : *p);} -+ if (uO.iso8859_2 == FASLE) { \ ++ if (uO.iso8859_2 == FALSE) { \ + for (p=(uch *)(str1); *p; p++) \ + *p = native((*p & 0x80) ? iso2oem[*p & 0x7f] : *p); \ + } \ @@ -121,10 +128,10 @@ # else # define _ISO_INTERN(str1) A_TO_N(str1) # endif -@@ -2471,8 +2478,15 @@ +@@ -2914,8 +2921,15 @@ char *GetLoadPath OF((__GPRO)); # define IZ_OEM2ISO_ARRAY # endif - # define _OEM_INTERN(str1) {register uch *p;\ + # define _OEM_INTERN(str1) if (oem2iso) {register uch *p;\ - for (p=(uch *)(str1); *p; p++)\ - *p = native((*p & 0x80) ? oem2iso[*p & 0x7f] : *p);} + if (uO.iso8859_2 == FALSE) { \ @@ -139,37 +146,36 @@ # endif #endif -@@ -2497,7 +2511,9 @@ - #if (!defined(INTERN_TO_ISO) && !defined(ASCII2ISO)) - # ifdef CRTL_CP_IS_OEM +@@ -2942,6 +2956,7 @@ char *GetLoadPath OF((__GPRO)); /* know: "ASCII" is "OEM" */ --# define ASCII2ISO(c) (((c) & 0x80) ? oem2iso[(c) & 0x7f] : (c)) -+# define ASCII2ISO(c) (((c) & 0x80) ? \ -+ ((uO.iso8859_2 == FALSE) ? oem2iso[(c) & 0x7f] : oem2iso_2[(c) & 0x7f]) : \ -+ (c)) + # define ASCII2ISO(c) \ + ((((c) & 0x80) && oem2iso) ? oem2iso[(c) & 0x7f] : (c)) ++ (( ((c) & 0x80) ? ((uO.iso8859_2 == FALSE) ? (oem2iso ? oem2iso[(c) & 0x7f] : (c)) : oem2iso_2[(c) & 0x7f]) : (c)) # if (defined(NEED_STR2ISO) && !defined(CRYP_USES_OEM2ISO)) # define CRYP_USES_OEM2ISO # endif -@@ -2513,7 +2529,9 @@ +@@ -2957,8 +2972,9 @@ char *GetLoadPath OF((__GPRO)); # define ASCII2OEM(c) (c) # else /* assume: "ASCII" is "ISO-ANSI" */ --# define ASCII2OEM(c) (((c) & 0x80) ? iso2oem[(c) & 0x7f] : (c)) +-# define ASCII2OEM(c) \ +- ((((c) & 0x80) && iso2oem) ? iso2oem[(c) & 0x7f] : (c)) +# define ASCII2OEM(c) (((c) & 0x80) ? \ -+ ((uO.iso8859_2 == FALSE) ? iso2oem[(c) & 0x7f] : iso2oem_2[(c) & 0x7f]) : \ ++ ((uO.iso8859_2 == FALSE) ? (iso2oem ? iso2oem[(c) & 0x7f] : (c)) : iso2oem_2[(c) & 0x7f]) : \ + (c)) # if (defined(NEED_STR2OEM) && !defined(CRYP_USES_ISO2OEM)) # define CRYP_USES_ISO2OEM # endif -@@ -2584,9 +2602,11 @@ +@@ -3029,10 +3045,12 @@ char *GetLoadPath OF((__GPRO)); #endif #ifdef IZ_ISO2OEM_ARRAY - extern ZCONST uch Far iso2oem[]; + extern ZCONST uch Far *iso2oem; + extern ZCONST uch Far iso2oem_2[]; + extern ZCONST uch Far iso2oem_850[]; #endif #ifdef IZ_OEM2ISO_ARRAY - extern ZCONST uch Far oem2iso[]; + extern ZCONST uch Far *oem2iso; + extern ZCONST uch Far oem2iso_2[]; + extern ZCONST uch Far oem2iso_850[]; #endif - extern ZCONST char Far VersionDate[]; ++++++ unzip-no_file_name_translation.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,6 +1,8 @@ ---- man/zipinfo.1-dist 2007-04-25 12:18:27.000000000 +0200 -+++ man/zipinfo.1 2007-04-25 12:19:43.000000000 +0200 -@@ -114,7 +114,10 @@ +Index: man/zipinfo.1 +=================================================================== +--- man/zipinfo.1.orig 2010-05-21 14:23:25.824590928 +0200 ++++ man/zipinfo.1 2010-05-21 14:24:41.631590822 +0200 +@@ -114,7 +114,10 @@ useful in cases where the stored filenam .TP .B \-s list zipfile info in short Unix ``\fCls \-l\fR'' format. This is the default @@ -12,32 +14,24 @@ .TP .B \-m list zipfile info in medium Unix ``\fCls \-l\fR'' format. Identical to the ---- man/unzip.1-dist 2007-04-25 12:04:20.000000000 +0200 -+++ man/unzip.1 2007-04-25 12:19:54.000000000 +0200 +Index: man/unzip.1 +=================================================================== +--- man/unzip.1.orig 2010-05-21 14:23:25.824590928 +0200 ++++ man/unzip.1 2010-05-21 14:24:41.635590912 +0200 @@ -25,7 +25,7 @@ unzip \- list, test and extract compressed files in a ZIP archive .PD .SH SYNOPSIS --\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMOVX$/:\fP]] -+\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMOSVX$/:\fP]] +-\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCDKLMOUVWX$/:^\fP]] ++\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCDKLMOSUVWX$/:^\fP]] \fIfile\fP[\fI.zip\fP] [\fIfile(s)\fP\ .\|.\|.] [\fB\-x\fP\ \fIxfile(s)\fP\ .\|.\|.] [\fB\-d\fP\ \fIexdir\fP] .PD -@@ -371,6 +371,11 @@ - spaces in filenames. Conversion of spaces to underscores can eliminate the - awkwardness in some cases. - .TP -+.B \-S -+suppress the conversion of file name encodings. This is useful when an -+archive contains file names with non-latin letters. You have to convert -+the file names appropriately to your native encoding manually afterwards. -+.TP - .B \-U - (obsolete; to be removed in a future release) leave filenames uppercase if - created under MS-DOS, VMS, etc. See \fB\-L\fP above. ---- unzpriv.h-dist 2007-04-25 11:55:59.000000000 +0200 -+++ unzpriv.h 2007-04-25 12:12:22.000000000 +0200 -@@ -2577,6 +2577,7 @@ char *GetLoadPath OF((__GPRO)); +Index: unzpriv.h +=================================================================== +--- unzpriv.h.orig 2010-05-21 14:24:02.641090783 +0200 ++++ unzpriv.h 2010-05-21 14:24:55.632590821 +0200 +@@ -3020,6 +3020,7 @@ char *GetLoadPath OF((__GPRO)); */ #ifndef Ext_ASCII_TO_Native # define Ext_ASCII_TO_Native(string, hostnum, hostver, isuxatt, islochdr) \ @@ -45,7 +39,7 @@ if (((hostnum) == FS_FAT_ && \ !(((islochdr) || (isuxatt)) && \ ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \ -@@ -2585,7 +2586,7 @@ char *GetLoadPath OF((__GPRO)); +@@ -3028,7 +3029,7 @@ char *GetLoadPath OF((__GPRO)); _OEM_INTERN((string)); \ } else { \ _ISO_INTERN((string)); \ @@ -54,9 +48,11 @@ #endif ---- zipinfo.c-dist 2007-04-25 12:17:17.000000000 +0200 -+++ zipinfo.c 2007-04-25 12:18:09.000000000 +0200 -@@ -517,6 +517,12 @@ int zi_opts(__G__ pargc, pargv) +Index: zipinfo.c +=================================================================== +--- zipinfo.c.orig 2010-05-21 14:23:25.824590928 +0200 ++++ zipinfo.c 2010-05-21 14:24:41.695590831 +0200 +@@ -527,6 +527,12 @@ int zi_opts(__G__ pargc, pargv) else uO.lflag = 3; break; @@ -69,24 +65,29 @@ case 't': /* totals line */ if (negative) tflag_2v = tflag_slm = FALSE, negative = 0; ---- unzip.c-dist 2007-04-25 11:58:44.000000000 +0200 -+++ unzip.c 2007-04-25 12:12:35.000000000 +0200 -@@ -1416,6 +1416,12 @@ int uz_opts(__G__ pargc, pargv) - uO.sflag = TRUE; +Index: unzip.c +=================================================================== +--- unzip.c.orig 2010-05-21 14:23:25.824590928 +0200 ++++ unzip.c 2010-05-21 14:24:41.727590745 +0200 +@@ -1689,6 +1689,13 @@ int uz_opts(__G__ pargc, pargv) + else + uO.S_flag = TRUE; break; - #endif /* DOS_FLX_NLM_OS2_W32 */ -+ case ('S'): /* suppress file name encoding conversions */ ++#else ++ case ('S'): /* suppress file name encoding conversions */ + if (negative) + uO.no_conv_enc = FALSE, negative = 0; + else + uO.no_conv_enc = TRUE; + break; + #endif /* VMS */ case ('t'): if (negative) - uO.tflag = FALSE, negative = 0; ---- unzip.h-dist 2007-04-25 11:59:03.000000000 +0200 -+++ unzip.h 2007-04-25 12:12:11.000000000 +0200 -@@ -478,6 +478,7 @@ typedef struct _UzpOpts { +Index: unzip.h +=================================================================== +--- unzip.h.orig 2010-05-21 14:23:25.824590928 +0200 ++++ unzip.h 2010-05-21 14:24:41.731591035 +0200 +@@ -518,6 +518,7 @@ typedef struct _UzpOpts { #if (defined(MSDOS) || defined(FLEXOS) || defined(OS2) || defined(WIN32)) int sflag; /* -s: convert spaces in filenames to underscores */ #endif ++++++ unzip-open_missing_mode.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,13 +1,77 @@ ---- fileio.c -+++ fileio.c -@@ -425,7 +425,9 @@ - Trace((stderr, "open_outfile: doing fopen(%s) for writing\n", - FnFilter1(G.filename))); - -- fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT); -+ fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT, -+ /* 0644 in portable POSIX notation: */ -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if ((G.outfile = fdopen(fd, FOPW)) == (FILE *)NULL) { +Index: fileio.c +=================================================================== +--- fileio.c.orig 2009-04-20 02:03:44.000000000 +0200 ++++ fileio.c 2010-06-25 18:32:49.960030697 +0200 +@@ -71,6 +71,11 @@ + #include "crc32.h" + #include "crypt.h" + #include "ttyio.h" ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++ ++ + + /* setup of codepage conversion for decryption passwords */ + #if CRYPT +@@ -270,6 +275,7 @@ int open_input_file(__G) /* return 1 + int open_outfile(__G) /* return 1 if fail */ + __GDEF + { ++ int fd; + #ifdef DLL + if (G.redirect_data) + return (redirect_outfile(__G) == FALSE); +@@ -448,23 +454,48 @@ int open_outfile(__G) /* retur + return 1; /* with "./" fix in checkdir(), should never reach here */ + } + #endif /* NOVELL_BUG_FAILSAFE */ +- Trace((stderr, "open_outfile: doing fopen(%s) for writing\n", +- FnFilter1(G.filename))); + { + #if defined(ATH_BE_UNX) || defined(AOS_VS) || defined(QDOS) || defined(TANDEM) + mode_t umask_sav = umask(0077); + #endif ++ ++#if defined(SYMLINKS) || defined(QLZIP) ++ fd = open(G.filename, O_RDWR | O_LARGEFILE | O_CREAT, ++ /* 0644 in portable POSIX notation: */ ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++#else ++ fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT, ++ /* 0644 in portable POSIX notation: */ ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++#endif ++ Trace((stderr, "open_outfile: open(%s, O_WRONLY | O_LARGEFILE | O_CREAT) returned %d\n", ++ FnFilter1(G.filename), fd)); ++ ++ if (fd < 0) { ++ Info(slide, 0x401, ((char *)slide, LoadFarString(CannotCreateFile), ++ FnFilter1(G.filename), strerror(errno))); ++ return 1; ++ } + #if defined(SYMLINKS) || defined(QLZIP) + /* These features require the ability to re-read extracted data from + the output files. Output files are created with Read&Write access. + */ +- G.outfile = zfopen(G.filename, FOPWR); ++ ++ G.outfile = zfdopen(fd, FOPWR); ++ ++ Trace((stderr, "open_outfile: doing fdopen(%s, FOPWR) returned %p\n", ++ G.outfile)); + #else +- G.outfile = zfopen(G.filename, FOPW); ++ G.outfile = zfdopen(fd, FOPW); ++ ++ Trace((stderr, "open_outfile: doing fdopen(%s, FOPW) returned %p\n", ++ G.outfile)); + #endif + #if defined(ATH_BE_UNX) || defined(AOS_VS) || defined(QDOS) || defined(TANDEM) + umask(umask_sav); + #endif ++ if (G.outfile == NULL && fd != 0) ++ unlink(G.filename); + } + if (G.outfile == (FILE *)NULL) { Info(slide, 0x401, ((char *)slide, LoadFarString(CannotCreateFile), - FnFilter1(G.filename))); ++++++ unzip-optflags.patch ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,22 +1,22 @@ Index: unix/Makefile =================================================================== ---- unix/Makefile.orig 2010-05-10 17:45:59.892090727 +0200 -+++ unix/Makefile 2010-05-10 17:46:18.636090912 +0200 -@@ -773,7 +773,7 @@ isi: unix_make +--- unix/Makefile.orig 2010-05-21 13:11:26.128591070 +0200 ++++ unix/Makefile 2010-05-21 13:14:45.429090869 +0200 +@@ -809,7 +809,7 @@ isi: unix_make linux: unix_make @echo 'NOTE: use linux_noasm target for non-Intel Linux compiles.' $(MAKE) unzips CC=gcc LD=gcc AS=gcc\ -- CF="-O3 -Wall -I. -DASM_CRC $(LOC)"\ -+ CF="$(RPM_OPT_FLAGS) -I. -DASM_CRC $(LOC)"\ - AF="-Di386 $(AF)" CRC32=crc_gcc +- CFLAGS="-O3 -Wall -DASM_CRC"\ ++ CFLAGS="$(RPM_OPT_FLAGS) -DASM_CRC"\ + AF="-Di386 $(AF)" CRCA_O=crc_gcc$O # GRR: this echo is pointless; if user gets this far, no difference to install # @echo 'Be sure to use the install_asm target rather than the install target' -@@ -783,7 +783,7 @@ linux_asm: linux +@@ -819,7 +819,7 @@ linux_asm: linux # Linux (Posix, approximately SysV): virtually any version since before 0.96, # for any platform. Change "-O" to "-O3" or whatever, as desired... linux_noasm: unix_make -- $(MAKE) unzips CC=gcc LD=gcc CF="-O -Wall -I. $(LOC)" -+ $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS) -I. $(LOC)" +- $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O -Wall" ++ $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS)" # Linux with lcc compiler: __inline__ (stat.h) not recognized, and must edit # /usr/include/gnu/types.h to get rid of "long long" if __LCC__ defined. -O3 ++++++ unzip.dif ++++++ --- /var/tmp/diff_new_pack.x9jnK1/_old 2010-07-30 12:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.x9jnK1/_new 2010-07-30 12:44:47.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nur unzip-5.50.orig/unix/Makefile unzip-5.50/unix/Makefile ---- unzip-5.50.orig/unix/Makefile Sat Feb 16 18:00:38 2002 -+++ unzip-5.50/unix/Makefile Mon Mar 11 08:40:41 2002 -@@ -61,8 +61,8 @@ +Index: unix/Makefile +=================================================================== +--- unix/Makefile.orig 2009-01-18 23:41:18.000000000 +0100 ++++ unix/Makefile 2010-05-21 14:06:56.192590841 +0200 +@@ -64,8 +64,8 @@ FL2 = $(LF2) # general-purpose stuff #CP = cp @@ -12,7 +13,7 @@ RM = rm -f CHMOD = chmod BINPERMS = 755 -@@ -102,7 +102,7 @@ +@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL) INSTALL_D = mkdir -p # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate manext = 1 ++++++ unzip552.tar.bz2 -> unzip60.tar.bz2 ++++++ ++++ 83230 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cyrus-sasl for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package cyrus-sasl for openSUSE:Factory checked in at Fri Jul 30 12:44:42 CEST 2010. -------- --- cyrus-sasl/cyrus-sasl-saslauthd.changes 2010-06-09 16:41:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/cyrus-sasl/cyrus-sasl-saslauthd.changes 2010-07-30 12:43:46.030520000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- cyrus-sasl.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-sasl-saslauthd.spec ++++++ --- /var/tmp/diff_new_pack.1bMoxB/_old 2010-07-30 12:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.1bMoxB/_new 2010-07-30 12:43:58.000000000 +0200 @@ -28,7 +28,7 @@ Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.23 -Release: 7 +Release: 14 Source: cyrus-sasl-%{version}.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl.dif ++++++ cyrus-sasl.spec ++++++ --- /var/tmp/diff_new_pack.1bMoxB/_old 2010-07-30 12:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.1bMoxB/_new 2010-07-30 12:43:58.000000000 +0200 @@ -20,7 +20,7 @@ Name: cyrus-sasl Version: 2.1.23 -Release: 7 +Release: 14 BuildRequires: db-devel krb5-mini-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 <= %{version} Provides: cyrus-sasl2 = %{version} @@ -260,7 +260,7 @@ --enable-krb4=no \ --enable-sql=no \ --with-devrandom=/dev/urandom -%{__make} %{?jobs:-j%jobs} sasldir=%{_libdir}/sasl2 +%{__make} %{?_smp_mflags} sasldir=%{_libdir}/sasl2 %install make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit e2fsprogs for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at Fri Jul 30 12:44:34 CEST 2010. -------- --- e2fsprogs/e2fsprogs.changes 2010-03-18 12:00:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/e2fsprogs/e2fsprogs.changes 2010-07-09 19:50:17.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Jun 30 16:11:36 UTC 2010 - jengelh(a)medozas.de + +- Do package libext2fs.a (BuildRequired for silo) on SPARC + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Mon Apr 19 16:21:09 UTC 2010 - pth(a)novell.com + +- Regenerate patch so that it applies without fuzz. +- Fix spec file. + +------------------------------------------------------------------- +Mon Apr 19 16:10:38 UTC 2010 - pth(a)novell.com + +- Bring german message catalog up-to-date. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- e2fsprogs-1.41.4.de.po New: ---- e2fsprogs-1.41.11.de.po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.RwZaIn/_old 2010-07-30 12:43:52.000000000 +0200 +++ /var/tmp/diff_new_pack.RwZaIn/_new 2010-07-30 12:43:52.000000000 +0200 @@ -31,13 +31,13 @@ %endif # Version: 1.41.11 -Release: 1 +Release: 4 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 Source2: README.SUSE Source3: baselibs.conf -Source6: %{name}-1.41.4.de.po +Source6: %{name}-%{version}.de.po # # e2fsprogs patches # @@ -121,7 +121,7 @@ %prep %setup -q # e2fsprogs patches -%patch7 -p1 +%patch7 # libcom_err patches %patch34 -p1 cp %{SOURCE2} . @@ -129,19 +129,15 @@ %build autoreconf --force --install -./configure --prefix=%{_prefix} \ +%{configure} \ --with-root-prefix='' \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ --enable-elf-shlibs \ - --disable-evms \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ --disable-fsck \ CFLAGS="$RPM_OPT_FLAGS" -%{__make} %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib} @@ -151,7 +147,11 @@ rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8* rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8* +%ifarch %sparc +rm -v %{buildroot}%{_libdir}/lib{com,e2p,ss}*.a +%else rm -v %{buildroot}%{_libdir}/*.a +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -217,6 +217,9 @@ %files -n libext2fs-devel %defattr(-, root, root) %{_libdir}/libext2fs.so +%ifarch %sparc +%{_libdir}/libext2fs.a +%endif %{_libdir}/libe2p.so /usr/include/ext2fs /usr/include/e2p ++++++ e2fsprogs-1.41.1-splash_support.patch ++++++ --- /var/tmp/diff_new_pack.RwZaIn/_old 2010-07-30 12:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.RwZaIn/_new 2010-07-30 12:43:53.000000000 +0200 @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.41.7/e2fsck/splash.c +Index: e2fsck/splash.c =================================================================== ---- /dev/null -+++ e2fsprogs-1.41.7/e2fsck/splash.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ e2fsck/splash.c 2010-04-19 13:46:32.808011099 +0200 @@ -0,0 +1,100 @@ +/* + * add support for switching the splash screen on boot @@ -103,10 +103,10 @@ + verbose = 1; +} + -Index: e2fsprogs-1.41.7/e2fsck/splash.h +Index: e2fsck/splash.h =================================================================== ---- /dev/null -+++ e2fsprogs-1.41.7/e2fsck/splash.h +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ e2fsck/splash.h 2010-04-19 13:46:32.824003188 +0200 @@ -0,0 +1,13 @@ +#ifndef _SPLASH_H +#define _SPLASH_H @@ -121,11 +121,11 @@ + +#endif /* _SPLASH_H */ + -Index: e2fsprogs-1.41.7/e2fsck/Makefile.in +Index: e2fsck/Makefile.in =================================================================== ---- e2fsprogs-1.41.7.orig/e2fsck/Makefile.in -+++ e2fsprogs-1.41.7/e2fsck/Makefile.in -@@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil +--- e2fsck/Makefile.in.orig 2010-02-23 05:40:50.000000000 +0100 ++++ e2fsck/Makefile.in 2010-04-19 13:46:32.863915437 +0200 +@@ -64,7 +64,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \ pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \ @@ -134,7 +134,7 @@ PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \ profiled/super.o profiled/pass1.o profiled/pass1b.o \ -@@ -101,6 +101,7 @@ SRCS= $(srcdir)/e2fsck.c \ +@@ -102,6 +102,7 @@ SRCS= $(srcdir)/e2fsck.c \ $(srcdir)/rehash.c \ $(srcdir)/region.c \ $(srcdir)/profile.c \ @@ -142,16 +142,16 @@ prof_err.c \ $(MTRACE_SRC) -@@ -475,3 +476,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e +@@ -452,3 +453,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/profile.h prof_err.h prof_err.o: prof_err.c +splash.o: splash.c splash.h + -Index: e2fsprogs-1.41.7/e2fsck/unix.c +Index: e2fsck/unix.c =================================================================== ---- e2fsprogs-1.41.7.orig/e2fsck/unix.c -+++ e2fsprogs-1.41.7/e2fsck/unix.c +--- e2fsck/unix.c.orig 2010-03-15 05:14:12.000000000 +0100 ++++ e2fsck/unix.c 2010-04-19 13:46:32.899004459 +0200 @@ -53,6 +53,7 @@ extern int optind; #include "e2p/e2p.h" #include "e2fsck.h" @@ -160,7 +160,7 @@ #include "../version.h" /* Command line options */ -@@ -941,6 +942,7 @@ int main (int argc, char *argv[]) +@@ -956,6 +957,7 @@ int main (int argc, char *argv[]) int sysval, sys_page_size = 4096; __u32 features[3]; char *cp; @@ -168,7 +168,7 @@ clear_problem_context(&pctx); #ifdef MTRACE -@@ -970,6 +972,7 @@ int main (int argc, char *argv[]) +@@ -985,6 +987,7 @@ int main (int argc, char *argv[]) exit(FSCK_ERROR); } reserve_stdio_fds(); @@ -176,7 +176,7 @@ init_resource_track(&ctx->global_rtrack, NULL); if (!(ctx->options & E2F_OPT_PREEN) || show_version_only) -@@ -1284,6 +1287,7 @@ print_unsupp_features: +@@ -1304,6 +1307,7 @@ print_unsupp_features: fatal_error(ctx, 0); check_if_skip(ctx); check_resize_inode(ctx); ++++++ e2fsprogs-1.41.4.de.po -> e2fsprogs-1.41.11.de.po ++++++ ++++ 5196 lines (skipped) ++++ between e2fsprogs/e2fsprogs-1.41.4.de.po ++++ and /mounts/work_src_done/STABLE/e2fsprogs/e2fsprogs-1.41.11.de.po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpng12 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package libpng12 for openSUSE:Factory checked in at Fri Jul 30 12:40:35 CEST 2010. -------- --- libpng12/libpng12.changes 2010-06-28 18:45:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpng12/libpng12.changes 2010-07-29 15:13:42.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 29 15:09:48 CEST 2010 - pgajdos(a)suse.cz + +- add devel packages to baselibs.conf [bnc#625883] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng12.spec ++++++ --- /var/tmp/diff_new_pack.7T6wm9/_old 2010-07-30 12:36:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7T6wm9/_new 2010-07-30 12:36:21.000000000 +0200 @@ -28,7 +28,7 @@ Group: System/Libraries Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} -Release: 1 +Release: 5 Summary: Library for the Portable Network Graphics Format (PNG) Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.7T6wm9/_old 2010-07-30 12:36:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7T6wm9/_new 2010-07-30 12:36:21.000000000 +0200 @@ -1,3 +1,5 @@ libpng12-0 obsoletes "libpng-<targettype> < <version>" provides "libpng-<targettype> = <version>" +libpng12-devel +libpng12-compat-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit doxygen for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at Fri Jul 30 12:40:31 CEST 2010. -------- --- doxygen/doxygen.changes 2010-02-21 16:20:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/doxygen/doxygen.changes 2010-06-25 21:01:49.000000000 +0200 @@ -1,0 +2,40 @@ +Fri Jun 25 18:50:45 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.7.1: + * Changes: + + id 621695: Made warning and error messages appear with lower case "warning:" and "error:" prefix to make it easier to use the messages from Visual Studio + * New features: + + id 621908: added new config option FORMULA_TRANSPARENT which allows selecting between transparent (YES) or non-transparent (NO) PNGs for formulas in the HTML output. + + update for Turkish translation + * Bug fixes: + + id 533821: Inheritance relation for a C# class deriving from a generic class was not handled correctly + + id 554638: Changing DOT_IMAGE_FORMAT did not cause the graphs to be regenerated + + id 576533: A field of the form "enum E *p" was ignore + + id 597016: Hide scope name was not working properly for todo items inside class members, where the class was inside a namespace + + id 617761: In dot graphs now also @ref worked (previously only \ref was supported) + + id 621733: Removed bogus warning about undocument return type for define when WARN_NO_PARAMDOC was enabled + + id 621780: Fixed parsing support for a function that returns a struct definition + + id 621785: Doxygen could hang when using \copydoc in a function with \param + + id 621805: Using //!< after a #define no longer worked + + id 621854,622219,622593: html help compiler (and also the Qt help compiler) was called before all dot images were generated. + + id 621984: Using a auto-list in combination with \subpage cause the items to be inlined + + id 622018: Fixed problem parsing a @param command where the text part started with a formula + + id 622019: Added some instructions how to document Fortran code + + id 622041: Using \var multiple times in a comment block did not work properly + + id 622413: Tooltips could get wrongly truncated when multi-byte UTF-8 characters were used + + id 622471: Argument matching failed for typedef in another namespace + + Fixed crash situation while handling commands inside a @ref section + + Treeview icons were missing in the HTML output when setting GENERATE_TREEVIEW to NO and USE_INLINE_TREES to YES + +------------------------------------------------------------------- +Tue Jun 15 13:04:46 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.7.0: + * the look of the HTML output was changed + * the color of HTML output can now be changed easily + * several performance enhancements were included: + + ability to run multiple instances of dot in parallel for + faster graph generation + * many bugs have been fixed + +------------------------------------------------------------------- --- doxygen/doxywizard.changes 2010-02-21 16:21:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/doxygen/doxywizard.changes 2010-06-25 21:02:04.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 25 18:52:36 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.7.1 + +------------------------------------------------------------------- +Tue Jun 15 13:05:30 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.7.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- doxygen-1.5.9-qtdir.patch doxygen-1.6.0-warnings.patch doxygen-1.6.3-html.tar.bz2 doxygen-1.6.3-modify_footer.patch doxygen-1.6.3.src.tar.bz2 doxygen_manual-1.6.3.pdf.bz2 New: ---- doxygen-1.7.0-modify_footer.patch doxygen-1.7.0-warnings.patch doxygen-1.7.1-html.tar.bz2 doxygen-1.7.1-qtdir.patch doxygen-1.7.1.src.tar.bz2 doxygen_manual-1.7.1.pdf.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.lxfyM9/_old 2010-07-30 12:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lxfyM9/_new 2010-07-30 12:38:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package doxygen (Version 1.6.3) +# spec file for package doxygen (Version 1.7.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: doxygen BuildRequires: bison flex gcc-c++ libpng-devel -Version: 1.6.3 +Version: 1.7.1 Release: 1 AutoReqProv: on License: GPLv2+ @@ -37,7 +37,7 @@ Patch: %{name}-1.5.9-64archs.patch Patch2: %{name}-1.5.9-arm.patch Patch3: %{name}-1.5.9-man.patch -Patch4: %{name}-1.6.3-modify_footer.patch +Patch4: %{name}-1.7.0-modify_footer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ######################################################################################### # SuSE, openSUSE @@ -77,7 +77,7 @@ %patch %patch2 %patch3 -%patch4 -p1 +%patch4 cp -v %{S:3} . bzip2 -d %{name}_manual-%{version}.pdf.bz2 ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.lxfyM9/_old 2010-07-30 12:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lxfyM9/_new 2010-07-30 12:38:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package doxywizard (Version 1.6.3) +# spec file for package doxywizard (Version 1.7.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: doxywizard BuildRequires: bison flex gcc-c++ libdrm-devel libjpeg-devel -Version: 1.6.3 +Version: 1.7.1 Release: 1 AutoReqProv: on Requires: doxygen = %{version} @@ -34,8 +34,8 @@ Patch2: %{name}-1.5.9-flex.patch Patch4: doxygen-1.5.9-arm.patch Patch5: doxygen-1.5.9-man.patch -Patch6: doxygen-1.5.9-qtdir.patch -Patch100: doxygen-1.6.0-warnings.patch +Patch6: doxygen-1.7.1-qtdir.patch +Patch100: doxygen-1.7.0-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ######################################################################################### # SuSE, openSUSE @@ -82,7 +82,7 @@ %if 0%{?suse_version} %patch6 %endif -%patch100 -p1 +%patch100 %build %if 0%{?suse_version} @@ -130,14 +130,16 @@ %{_datadir}/applications/doxywizard.desktop %attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.%{man_ext} -%post %if 0%{?mandriva_version} || 0%{?mdkversion} + +%post %update_menus %{update_desktop_database} %endif -%postun %if 0%{?mandriva_version} || 0%{?mdkversion} + +%postun %clean_menus %{clean_desktop_database} %endif ++++++ doxygen-1.6.3-modify_footer.patch -> doxygen-1.7.0-modify_footer.patch ++++++ --- doxygen/doxygen-1.6.3-modify_footer.patch 2010-02-21 16:19:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/doxygen/doxygen-1.7.0-modify_footer.patch 2010-06-15 16:59:44.000000000 +0200 @@ -1,58 +1,53 @@ -diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/config.xml doxygen-1.6.3.modify_footer/src/config.xml ---- doxygen-1.6.3/src/config.xml 2010-02-13 15:19:31.000000000 +0100 -+++ doxygen-1.6.3.modify_footer/src/config.xml 2010-02-21 15:52:16.000000000 +0100 -@@ -741,6 +741,10 @@ - If the GENERATE_HTML tag is set to YES (the default) Doxygen will - generate HTML output. - ' defval='1'/> +--- src/config.xml.orig 2010-06-15 15:12:20.000000000 +0200 ++++ src/config.xml 2010-06-15 15:13:33.000000000 +0200 +@@ -761,6 +761,11 @@ + each generated HTML page. If it is left blank doxygen will generate a + standard footer. + ' defval='' depends='GENERATE_HTML'/> + <option type='bool' id='HTML_FOOTER_DESCRIPTION' docs=' -+The HTML_FOOTER_DATE_AND_PROJECT_NAME tag can be used to add build date, -+project name and Doxygen version to HTML footer. -+' defval='0' depends='GENERATE_HTML'/> - <option type='string' id='HTML_OUTPUT' format='dir' docs=' - The HTML_OUTPUT tag is used to specify where the HTML docs will be put. - If a relative path is entered the value of OUTPUT_DIRECTORY will be -diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/configoptions.cpp doxygen-1.6.3.modify_footer/src/configoptions.cpp ---- doxygen-1.6.3/src/configoptions.cpp 2010-02-13 15:19:33.000000000 +0100 -+++ doxygen-1.6.3.modify_footer/src/configoptions.cpp 2010-02-21 15:52:16.000000000 +0100 -@@ -1051,6 +1051,15 @@ - TRUE - ); - //---- -+ cb = cfg->addBool( -+ "HTML_FOOTER_DESCRIPTION", -+ "If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will \n" -+ "add generated date, project name and doxygen version to HTML footer.", -+ FALSE -+ ); -+ //cs->setDefaultValue("FALSE"); -+ cs->addDependency("GENERATE_HTML"); -+ //---- - cs = cfg->addString( - "HTML_OUTPUT", - "The HTML_OUTPUT tag is used to specify where the HTML docs will be put.\n" -diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/htmlgen.cpp doxygen-1.6.3.modify_footer/src/htmlgen.cpp ---- doxygen-1.6.3/src/htmlgen.cpp 2010-01-04 22:22:05.000000000 +0100 -+++ doxygen-1.6.3.modify_footer/src/htmlgen.cpp 2010-02-21 15:56:21.000000000 +0100 -@@ -787,10 +787,18 @@ - { ++The HTML_FOOTER_DATE_AND_PROJECT_NAME tag can be used to add build date, ++project name and Doxygen version to HTML footer. ++standard footer. ++' defval='' depends='GENERATE_HTML'/> + <option type='string' id='HTML_STYLESHEET' format='file' docs=' + The HTML_STYLESHEET tag can be used to specify a user-defined cascading + style sheet that is used by each HTML page. It can be used to +--- src/htmlgen.cpp.orig 2010-06-15 15:14:40.000000000 +0200 ++++ src/htmlgen.cpp 2010-06-15 15:16:10.000000000 +0200 +@@ -952,10 +952,16 @@ QTextStream t(&file); - t << "<hr class=\"footer\"/><address style=\"text-align: right;\"><small>\n"; -- t << theTranslator->trGeneratedAt( "$datetime", "$projectname" ); + t.setEncoding(QTextStream::UnicodeUTF8); + t << "<hr class=\"footer\"/><address class=\"footer\"><small>\n"; ++ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) { + t << theTranslator->trGeneratedAt( "$datetime", "$projectname" ); - t << " <a href=\"http://www.doxygen.org/index.html\">" -+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) -+ { -+ t << theTranslator->trGeneratedAt( "$datetime", "$projectname" ); -+ t << "&nbsp"; ++ t << " "; + } + t << "<a href=\"http://www.doxygen.org/index.html\">" - << "<img class=\"footer\" src=\"doxygen.png\" alt=\"doxygen\"/>" + << "<img class=\"footer\" src=\"$relpath$doxygen.png\" alt=\"doxygen\"/>" - << "</a> $doxygenversion"; + << "</a>"; -+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) -+ { -+ t << " $doxygenversion"; ++ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) { ++ t << " $doxygenversion"; + } t << "</small></address>\n" << "</body>\n" << "</html>\n"; +--- src/configoptions.cpp.orig 2010-06-15 15:13:45.000000000 +0200 ++++ src/configoptions.cpp 2010-06-15 15:14:28.000000000 +0200 +@@ -1095,6 +1095,15 @@ + cs->setWidgetType(ConfigString::File); + cs->addDependency("GENERATE_HTML"); + //---- ++ cb = cfg->addBool( ++ "HTML_FOOTER_DESCRIPTION", ++ "If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will \n" ++ "add generated date, project name and doxygen version to HTML footer.", ++ FALSE ++ ); ++ //cs->setDefaultValue("FALSE"); ++ cs->addDependency("GENERATE_HTML"); ++ //---- + cs = cfg->addString( + "HTML_STYLESHEET", + "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n" ++++++ doxygen-1.6.0-warnings.patch -> doxygen-1.7.0-warnings.patch ++++++ --- doxygen/doxygen-1.6.0-warnings.patch 2009-08-21 15:25:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/doxygen/doxygen-1.7.0-warnings.patch 2010-06-15 16:59:45.000000000 +0200 @@ -1,10 +1,9 @@ -diff -U 3 -H -d -r -N -- doxygen-1.6.0/src/util.cpp doxygen-1.6.0-warnings/src/util.cpp ---- doxygen-1.6.0/src/util.cpp 2009-08-20 14:13:51.000000000 +0200 -+++ doxygen-1.6.0-warnings/src/util.cpp 2009-08-21 15:07:16.000000000 +0200 -@@ -4760,9 +4760,9 @@ - { +--- src/util.cpp.orig 2010-06-15 15:51:48.000000000 +0200 ++++ src/util.cpp 2010-06-15 15:52:27.000000000 +0200 +@@ -4794,9 +4794,9 @@ static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES"); - QCString result; + static StrBuf strBuf; + strBuf.clear(); - char c; + unsigned char c; const char *p=name; @@ -13,9 +12,9 @@ { switch(c) { -@@ -4789,11 +4789,11 @@ - case '+': result+="_09"; break; - case '=': result+="_0A"; break; +@@ -4823,11 +4823,11 @@ + case '+': strBuf.addStr("_09"); break; + case '=': strBuf.addStr("_0A"); break; default: - if (c<0) + if (c>0x7f) ++++++ doxygen-1.6.3-html.tar.bz2 -> doxygen-1.7.1-html.tar.bz2 ++++++ ++++ 5624 lines of diff (skipped) ++++++ doxygen-1.5.9-qtdir.patch -> doxygen-1.7.1-qtdir.patch ++++++ --- doxygen/doxygen-1.5.9-qtdir.patch 2009-05-04 13:25:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/doxygen/doxygen-1.7.1-qtdir.patch 2010-06-25 21:00:44.000000000 +0200 @@ -1,10 +1,10 @@ ---- ./configure -+++ ./configure +--- configure.orig 2010-06-25 20:54:23.000000000 +0200 ++++ configure 2010-06-25 20:54:40.000000000 +0200 @@ -268,7 +268,7 @@ if test -z "$QTDIR"; then echo " QTDIR environment variable not set!" echo -n " Checking for Qt..." -- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do +- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do + for d in /usr; do if test -x "$d/bin/qmake"; then QTDIR=$d ++++++ doxygen-1.6.3.src.tar.bz2 -> doxygen-1.7.1.src.tar.bz2 ++++++ ++++ 144542 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpng14 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package libpng14 for openSUSE:Factory checked in at Fri Jul 30 12:38:02 CEST 2010. -------- --- libpng14/libpng14.changes 2010-06-28 18:39:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpng14/libpng14.changes 2010-07-30 09:46:30.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 29 15:14:31 CEST 2010 - pgajdos(a)suse.cz + +- add devel packages to baselbis.conf [bnc#625883] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng14.spec ++++++ --- /var/tmp/diff_new_pack.epFb8a/_old 2010-07-30 12:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.epFb8a/_new 2010-07-30 12:36:51.000000000 +0200 @@ -28,7 +28,7 @@ Group: System/Libraries Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} -Release: 1 +Release: 5 Summary: Library for the Portable Network Graphics Format (PNG) Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.epFb8a/_old 2010-07-30 12:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.epFb8a/_new 2010-07-30 12:36:51.000000000 +0200 @@ -1,3 +1,5 @@ libpng14-14 obsoletes "libpng-<targettype> < <version>" provides "libpng-<targettype> = <version>" +libpng14-devel +libpng14-compat-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit freetype2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at Fri Jul 30 12:36:14 CEST 2010. -------- --- freetype2/freetype2.changes 2010-06-04 13:09:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/freetype2/freetype2.changes 2010-07-20 17:52:32.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 20 17:50:44 CEST 2010 - tiwai(a)suse.de + +- updated to version 2.4.1: + * major version up + * bytecode interpreter is enabled as default in the upstream + * doc-reference is redundant, removed + +------------------------------------------------------------------- ft2demos.changes: same change calling whatdependson for head-i586 Old: ---- freetype-2.3.12.tar.bz2 freetype-doc-2.3.12.tar.bz2 freetype-doc-reference.tar.bz2 freetype2-bc.patch ft2demos-2.3.12.tar.bz2 ft2demos-bc.patch New: ---- freetype-2.4.1.tar.bz2 freetype-doc-2.4.1.tar.bz2 ft2demos-2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.lIY8Ao/_old 2010-07-30 12:35:46.000000000 +0200 +++ /var/tmp/diff_new_pack.lIY8Ao/_new 2010-07-30 12:35:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package freetype2 (Version 2.3.12) +# spec file for package freetype2 (Version 2.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Obsoletes: freetype2-64bit %endif # -Version: 2.3.12 -Release: 6 +Version: 2.4.1 +Release: 1 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -38,14 +38,11 @@ # cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co ft2demos Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.… Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.… -# pregenerated to avoid build-dependence on python: -Source2: freetype-doc-reference.tar.bz2 Source3: baselibs.conf Patch3: freetype2-bitmap-foundry.patch Patch4: ft2-stream-compat.diff Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch -Patch100: freetype2-bc.patch Patch200: freetype2-subpixel.patch Patch201: use_unix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,15 +81,6 @@ It also contains a small tutorial for using that library. %prep -# The byte code interpreter is compiled in by default -# because of the following option. -# For most fonts it is disabled again by default in the -# fontconfig setup in /etc/fonts. But if it is already -# enabled at compilation time, it can be easily enabled -# at runtime. See also the variable BYTECODE_BW_MAX_PIXEL -# in /etc/sysconfig/fonts-config. -# -%define enable_bytecode_interpreter 1 %define enable_subpixel_rendering 0 %setup -q -n freetype-%{version} -a 1 %patch3 -p 1 -b .bitmap-foundry @@ -100,16 +88,10 @@ #%patch8 -p 1 %patch9 -p 1 %patch308961 -p 1 -%if %{enable_bytecode_interpreter} -%patch100 -p 1 -b .bytecode -%endif %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif %patch201 -p1 -pushd docs - tar xf $RPM_SOURCE_DIR/freetype-doc-reference.tar.bz2 -popd find . -name CVS -type d | xargs rm -rf find . -name ".cvsignore" | xargs rm -f cp /usr/share/automake*/config.{guess,sub} builds/unix ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.lIY8Ao/_old 2010-07-30 12:35:46.000000000 +0200 +++ /var/tmp/diff_new_pack.lIY8Ao/_new 2010-07-30 12:35:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ft2demos (Version 2.3.12) +# spec file for package ft2demos (Version 2.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ Group: Productivity/Publishing/Other AutoReqProv: on Supplements: fonts-config -Version: 2.3.12 -Release: 6 +Version: 2.4.1 +Release: 1 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -37,14 +37,10 @@ # Uncomment to save space: #NoSource: 0 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 -# pregenerated to avoid build-dependence on python: -Source2: freetype-doc-reference.tar.bz2 Patch4: ft2-stream-compat.diff Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch50: ft2demos-build-testname.patch -Patch100: freetype2-bc.patch -Patch101: ft2demos-bc.patch Patch200: freetype2-subpixel.patch Patch201: use_unix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,15 +49,6 @@ Freetype2 utilities and demo programs. %prep -# The byte code interpreter is compiled in by default -# because of the following option. -# For most fonts it is disabled again by default in the -# fontconfig setup in /etc/fonts. But if it is already -# enabled at compilation time, it can be easily enabled -# at runtime. See also the variable BYTECODE_BW_MAX_PIXEL -# in /etc/sysconfig/fonts-config. -# -%define enable_bytecode_interpreter 1 %define enable_subpixel_rendering 0%{?opensuse_bs} %setup -n freetype-%{freetype_version} -b 1 %patch4 -p 1 -b .ft2-stream-compat @@ -72,19 +59,10 @@ pushd ../ft2demos-%{version} %patch50 -p 1 popd -%if %{enable_bytecode_interpreter} -%patch100 -p 1 -b .bytecode -%endif -# pushd ../ft2demos-%{version} -# %patch101 -p 1 -# popd %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif %patch201 -p1 -pushd docs - tar xf $RPM_SOURCE_DIR/freetype-doc-reference.tar.bz2 -popd find . -name CVS -type d | xargs rm -rf find . -name ".cvsignore" | xargs rm -f cp /usr/share/automake*/config.{guess,sub} builds/unix ++++++ freetype-2.3.12.tar.bz2 -> freetype-2.4.1.tar.bz2 ++++++ ++++ 36830 lines of diff (skipped) ++++++ freetype-doc-2.3.12.tar.bz2 -> freetype-doc-2.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.3.12/docs/tutorial/step1.html new/freetype-2.4.1/docs/tutorial/step1.html --- old/freetype-2.3.12/docs/tutorial/step1.html 2009-10-19 11:50:22.000000000 +0200 +++ new/freetype-2.4.1/docs/tutorial/step1.html 2010-05-16 15:38:13.000000000 +0200 @@ -42,9 +42,9 @@ </h1> <h3 align=center> - © 2003, 2006, 2007 David Turner + © 2003, 2006, 2007, 2009, 2010 David Turner (<a href="mailto:david@freetype.org">david(a)freetype.org</a>)<br> - © 2003, 2006, 2007 The FreeType Development Team + © 2003, 2006, 2007, 2009, 2010 The FreeType Development Team (<a href="http://www.freetype.org">www.freetype.org</a>) </h3> @@ -381,7 +381,7 @@ </tr> <tr valign="top"> <td> - <tt>flags</tt> + <tt>face_flags</tt> </td> <td> <p>A 32-bit integer containing bit flags used to describe some @@ -419,7 +419,7 @@ </tr> <tr valign="top"> <td> - <tt>fixed_sizes</tt> + <tt>available_sizes</tt> </td> <td> <p>A pointer to an array of <tt>FT_Bitmap_Size</tt> @@ -1098,7 +1098,7 @@ <a href="step2.html">FreeType 2 Tutorial Step 2</a> </h3> -<p><font size=-3>Last update: 19-Oct-2009</font></p> +<p><font size=-3>Last update: 16-May-2010</font></p> </body> </html> ++++++ ft2demos-2.3.12.tar.bz2 -> ft2demos-2.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/ChangeLog new/ft2demos-2.4.1/ChangeLog --- old/ft2demos-2.3.12/ChangeLog 2010-02-11 16:39:13.000000000 +0100 +++ new/ft2demos-2.4.1/ChangeLog 2010-07-18 06:23:10.000000000 +0200 @@ -1,3 +1,92 @@ +2010-07-19 Werner Lemberg <wl(a)gnu.org> + + * Version 2.4.1 released. + ========================== + + + Tag sources with `VER-2-4-1'. + + * README: Updated. + +2010-07-17 Werner Lemberg <wl(a)gnu.org> + + ftmulti: Fix possible buffer overflow. + Based on a patch from Marek Kašík <mkasik(a)redhat.com>. + + * src/ftmulti.c (main): Limit axis name length in `Header'. + +2010-07-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + + ftdump: Show language ID for all cmap subtables. + + * src/ftdump.c (Print_Charmaps): Print the language IDs obtained by + FT_Get_CMap_Language_ID(). The language IDs is cast to FT_UInt, so + broken IDs (> 0xFFFF) will not be shown correctly. + +2010-07-12 Werner Lemberg <wl(a)gnu.org> + + * Version 2.4.0 released. + ========================== + + + Tag sources with `VER-2-4-0'. + + * README: Updated. + +2010-06-28 Werner Lemberg <wl(a)gnu.org> + + ftbench: Fix suboptions of `-b'. + + * src/ftbench.c (bench_desc): Add missing description for + FT_BENCH_LOAD_ADVANCES. + +2010-06-07 Werner Lemberg <wl(a)gnu.org> + + Fix Savannah bug #30054. + + * src/ftdiff.c, src/ftgrid.c, src/ftmulti.c, src/ftstring.c, + src/ftview.c: Use precision for `%s' where appropriate to avoid + buffer overflows. + +2010-04-14 Werner Lemberg <wl(a)gnu.org> + + ftdiff: Add support for LCD filter control. + + Key `l' cycles through the filter modes, `[' and `]' select the + custom filter weight, `-' and `+' (or `=') adjust the selected + filter weight. + + This is based on code written by Lifter + <http://unixforum.org/index.php?showuser=11691>. + + * src/ftdiff.c (ColumnStateRec): Add members for LCD filter control. + (render_state_init): Updated. + (render_state_draw): Add support for custom LCD filter. + (event_help): Document new keys. + Make help screen more compact. + (process_event): Handle new keys. + +2010-04-14 Werner Lemberg <wl(a)gnu.org> + + ftview: Add support for LCD filter control. + + Key `F' toggles custom LCD filter mode, `[' and `]' select the + custom filter weight, `-' and `+' (or `=') adjust the selected + filter weight. + + This is based on code written by Lifter + <http://unixforum.org/index.php?showuser=11691>. + + * src/ftview.c (INIT_SIZE, Render_Waterfall): Add space for a third + header line. + (status_): Add members for LCD filter control. + (event_help): Document new keys. + Make help screen more compact. + (Process_Event): Handle new keys. Use FTC_Manager_RemoveFaceID to + flush the bitmap caches, forcing a redraw. I'm not sure whether + this is the right thing, but it seems to work... + (write_header): Display custom filter weights. + 2010-02-11 Werner Lemberg <wl(a)gnu.org> * Version 2.3.12 released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/README new/ft2demos-2.4.1/README --- old/ft2demos-2.3.12/README 2010-02-11 16:39:33.000000000 +0100 +++ new/ft2demos-2.4.1/README 2010-07-18 06:23:20.000000000 +0200 @@ -8,8 +8,8 @@ downloaded one of the stable FreeType 2 source packages from our server, you most probably have to rename its directory, for example: - mv freetype-2.3.12 freetype2 on Unix - rename freetype-2.3.12 freetype2 on Windows + mv freetype-2.4.1 freetype2 on Unix + rename freetype-2.4.1 freetype2 on Windows WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftbench.c new/ft2demos-2.4.1/src/ftbench.c --- old/ft2demos-2.3.12/src/ftbench.c 2009-03-14 14:58:28.000000000 +0100 +++ new/ft2demos-2.4.1/src/ftbench.c 2010-06-28 17:56:23.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2009 by */ +/* Copyright 2002, 2003, 2004, 2005, 2006, 2009, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* ftbench: bench some common FreeType call paths */ @@ -87,6 +87,7 @@ const char* bench_desc[] = { "Load a glyph", + "Load advance widths", "Render a glyph", "Get FT_Glyph", "Get glyph cbox", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftdiff.c new/ft2demos-2.4.1/src/ftdiff.c --- old/ft2demos-2.3.12/src/ftdiff.c 2009-04-30 18:07:48.000000000 +0200 +++ new/ft2demos-2.4.1/src/ftdiff.c 2010-06-07 08:55:38.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2007, 2008, 2009 by */ +/* Copyright 2007, 2008, 2009, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -142,13 +142,17 @@ typedef struct _ColumnStateRec { - int use_kerning; - int use_deltas; - int use_lcd_filter; - int use_global_advance_width; - FT_LcdFilter lcd_filter; - HintMode hint_mode; - DisplayMode disp_mode; + int use_kerning; + int use_deltas; + int use_lcd_filter; + int use_global_advance_width; + FT_LcdFilter lcd_filter; + HintMode hint_mode; + DisplayMode disp_mode; + + int use_custom_lcd_filter; + unsigned char filter_weights[5]; + int fw_index; } ColumnStateRec, *ColumnState; @@ -204,14 +208,19 @@ state->columns[0].use_global_advance_width = 1; state->columns[0].lcd_filter = FT_LCD_FILTER_DEFAULT; state->columns[0].hint_mode = HINT_MODE_BYTECODE; - - state->columns[1] = state->columns[0]; - state->columns[1].hint_mode = HINT_MODE_AUTOHINT; + state->columns[0].use_custom_lcd_filter = 0; + state->columns[0].fw_index = 2; + /* freetype default filter weights */ + memcpy( state->columns[0].filter_weights, "\x10\x40\x70\x40\x10", 5); + + state->columns[1] = state->columns[0]; + state->columns[1].hint_mode = HINT_MODE_AUTOHINT; + state->columns[1].use_custom_lcd_filter = 1; state->columns[2] = state->columns[0]; state->columns[2].hint_mode = HINT_MODE_UNHINTED; - state->col = 2; + state->col = 1; if ( FT_Init_FreeType( &state->library ) != 0 ) panic( "could not initialize FreeType library. Check your code\n" ); @@ -430,6 +439,10 @@ if ( column->use_lcd_filter ) FT_Library_SetLcdFilter( face->glyph->library, column->lcd_filter ); + if ( column->use_custom_lcd_filter ) + FT_Library_SetLcdFilterWeights( face->glyph->library, + column->filter_weights ); + y += state->size->metrics.ascender / 64; line_height = state->size->metrics.height / 64; @@ -578,19 +591,42 @@ if ( !column->use_lcd_filter ) msg = "gray rendering"; + else if ( column->use_custom_lcd_filter ) + { + int fwi = column->fw_index; + unsigned char *fw = column->filter_weights; + + + msg = ""; + + sprintf( temp, + "%s0x%02X%s0x%02X%s0x%02X%s0x%02X%s0x%02X%s", + fwi == 0 ? "[" : " ", + fw[0], + fwi == 0 ? "]" : ( fwi == 1 ? "[" : " " ), + fw[1], + fwi == 1 ? "]" : ( fwi == 2 ? "[" : " " ), + fw[2], + fwi == 2 ? "]" : ( fwi == 3 ? "[" : " " ), + fw[3], + fwi == 3 ? "]" : ( fwi == 4 ? "[" : " " ), + fw[4], + fwi == 4 ? "]" : " " ); + state->display.disp_text( disp, left, bottom + 15, temp ); + } else switch ( column->lcd_filter ) { case FT_LCD_FILTER_NONE: - msg = "lcd without filtering"; + msg = "LCD without filtering"; break; case FT_LCD_FILTER_DEFAULT: - msg = "default lcd filter"; + msg = "default LCD filter"; break; case FT_LCD_FILTER_LIGHT: - msg = "light lcd filter"; + msg = "light LCD filter"; break; default: - msg = "legacy lcd filter"; + msg = "legacy LCD filter"; } state->display.disp_text( disp, left, bottom + 15, msg ); @@ -794,25 +830,24 @@ grLn(); grWriteln( "Use the following keys:" ); grLn(); - grWriteln( " F1 or ? : display this help screen" ); + grWriteln( " F1, ? display this help screen" ); grLn(); - grWriteln( " n : jump to next font file in arguments list" ); - grWriteln( " p : jump to previous font file in arguments list" ); + grWriteln( " n, p select previous/next font" ); grLn(); - grWriteln( " g : increase gamma by 0.1" ); - grWriteln( " v : decrease gamma by 0.1" ); + grWriteln( " 1, 2, 3 select left, middle, or right column" ); + grWriteln( " a toggle `ignore global advance width flag'" ); + grWriteln( " d toggle lsb/rsb deltas" ); + grWriteln( " h toggle hinting mode" ); + grWriteln( " k toggle kerning" ); + grWriteln( " g, v adjust gamma value" ); + grWriteln( " r toggle rendering mode" ); grLn(); - grWriteln( " 1-3 : change currently selected column" ); - grWriteln( " a : toggle `ignore global advance width flag" ); - grWriteln( " d : toggle lsb/rsb deltas" ); - grWriteln( " h : toggle hinting mode" ); - grWriteln( " k : toggle kerning" ); - grWriteln( " l : change LCD filter type" ); - grWriteln( " r : toggle rendering mode" ); - grWriteln( " Up : increase pointsize by 0.5 unit" ); - grWriteln( " Down : decrease pointsize by 0.5 unit" ); - grWriteln( " Page Up : increase pointsize by 5 units" ); - grWriteln( " Page Down : decrease pointsize by 5 units" ); + grWriteln( " l change LCD filter type" ); + grWriteln( " [, ] select custom LCD filter weight" ); + grWriteln( " -, +(=) adjust selected custom LCD filter weight"); + grLn(); + grWriteln( " Up, Down adjust pointsize by 0.5 unit" ); + grWriteln( " PgUp, PgDn adjust pointsize by 5 units" ); grLn(); grWriteln( "press any key to exit this help screen" ); @@ -963,8 +998,17 @@ break; case FT_LCD_FILTER_DEFAULT: - column->lcd_filter = FT_LCD_FILTER_LIGHT; - state->message = (char *)"using light LCD filter"; + if ( !column->use_custom_lcd_filter ) + { + column->use_custom_lcd_filter = 1; + state->message = (char*)"using custom LCD filter"; + } + else + { + column->use_custom_lcd_filter = 0; + column->lcd_filter = FT_LCD_FILTER_LIGHT; + state->message = (char *)"using light LCD filter"; + } break; case FT_LCD_FILTER_LIGHT: @@ -994,7 +1038,7 @@ column->use_lcd_filter = !column->use_lcd_filter; state->message = state->message0; sprintf( state->message0, "column %d is using %s", - state->col + 1, column->use_lcd_filter ? "lcd filtering" + state->col + 1, column->use_lcd_filter ? "LCD filtering" : "gray rendering" ); break; @@ -1002,6 +1046,39 @@ event_change_gamma( state, -0.1 ); break; + case grKEY( '[' ): + if ( !column->use_custom_lcd_filter ) + break; + + column->fw_index--; + if ( column->fw_index < 0 ) + column->fw_index = 4; + break; + + case grKEY( ']' ): + if ( !column->use_custom_lcd_filter ) + break; + + column->fw_index++; + if ( column->fw_index > 4 ) + column->fw_index = 0; + break; + + case grKEY( '-' ): + if ( !column->use_custom_lcd_filter ) + break; + + column->filter_weights[column->fw_index]--; + break; + + case grKEY( '+' ): + case grKEY( '=' ): + if ( !column->use_custom_lcd_filter ) + break; + + column->filter_weights[column->fw_index]++; + break; + default: break; } @@ -1054,11 +1131,11 @@ state->message = state->message0; if ( total > 1 ) - sprintf( state->message0, "%s %d/%d @ %5.1fpt", + sprintf( state->message0, "%.100s %d/%d @ %5.1fpt", state->filename, idx + 1, total, state->char_size ); else - sprintf( state->message0, "%s @ %5.1fpt", + sprintf( state->message0, "%.100s @ %5.1fpt", state->filename, state->char_size ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftdump.c new/ft2demos-2.4.1/src/ftdump.c --- old/ft2demos-2.3.12/src/ftdump.c 2009-03-14 14:58:28.000000000 +0100 +++ new/ft2demos-2.4.1/src/ftdump.c 2010-07-13 07:30:28.000000000 +0200 @@ -12,6 +12,7 @@ #include FT_FREETYPE_H #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_TABLES_H /* the following header shouldn't be used in normal programs */ #include FT_INTERNAL_DEBUG_H @@ -508,10 +509,11 @@ for( i = 0; i < face->num_charmaps; i++ ) { - printf( " %d: platform %d, encoding %d", + printf( " %d: platform %d, encoding %d, language %d", i, face->charmaps[i]->platform_id, - face->charmaps[i]->encoding_id ); + face->charmaps[i]->encoding_id, + (FT_UInt)FT_Get_CMap_Language_ID( face->charmaps[i] ) ); if ( i == active ) printf( " (active)" ); printf ( "\n" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftgrid.c new/ft2demos-2.4.1/src/ftgrid.c --- old/ft2demos-2.3.12/src/ftgrid.c 2009-04-30 18:15:21.000000000 +0200 +++ new/ft2demos-2.4.1/src/ftgrid.c 2010-06-07 08:57:05.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -787,22 +787,22 @@ switch ( error_code ) { case FT_Err_Ok: - sprintf( status.header_buffer, "%s %s (file `%s')", + sprintf( status.header_buffer, "%.50s %.50s (file `%.100s')", face->family_name, face->style_name, basename ); break; case FT_Err_Invalid_Pixel_Size: - sprintf( status.header_buffer, "Invalid pixel size (file `%s')", + sprintf( status.header_buffer, "Invalid pixel size (file `%.100s')", basename ); break; case FT_Err_Invalid_PPem: - sprintf( status.header_buffer, "Invalid ppem value (file `%s')", + sprintf( status.header_buffer, "Invalid ppem value (file `%.100s')", basename ); break; default: - sprintf( status.header_buffer, "File `%s': error 0x%04x", + sprintf( status.header_buffer, "File `%.100s': error 0x%04x", basename, (FT_UShort)error_code ); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftmulti.c new/ft2demos-2.4.1/src/ftmulti.c --- old/ft2demos-2.3.12/src/ftmulti.c 2009-03-14 14:58:28.000000000 +0100 +++ new/ft2demos-2.4.1/src/ftmulti.c 2010-07-17 18:15:08.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003, 2004, 2005 by */ +/* Copyright 1996-2000, 2003, 2004, 2005, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -34,7 +34,7 @@ #define MAXPTSIZE 500 /* dtp */ - char Header[128]; + char Header[256]; char* new_header = 0; const unsigned char* Text = (unsigned char*) @@ -795,7 +795,7 @@ Render_All( Num, ptsize ); } - sprintf( Header, "%s %s (file %s)", + sprintf( Header, "%.50s %.50s (file %.100s)", face->family_name, face->style_name, ft_basename( argv[file] ) ); @@ -816,10 +816,10 @@ char temp[32]; - sprintf( temp, " %s:%g", + sprintf( temp, " %50s:%g", multimaster->axis[n].name, - design_pos[n]/65536. ); - strcat( Header, temp ); + design_pos[n] / 65536.0 ); + strncat( Header, temp, sizeof( Header ) - 1 ); } } grWriteCellString( &bit, 0, 16, Header, fore_color ); @@ -830,7 +830,7 @@ } else { - sprintf( Header, "%s: not an MM font file, or could not be opened", + sprintf( Header, "%.100s: not an MM font file, or could not be opened", ft_basename( argv[file] ) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftstring.c new/ft2demos-2.4.1/src/ftstring.c --- old/ft2demos-2.3.12/src/ftstring.c 2009-03-14 14:58:28.000000000 +0100 +++ new/ft2demos-2.4.1/src/ftstring.c 2010-06-07 09:05:46.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2002, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 1996-2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -413,19 +413,20 @@ switch ( error_code ) { case FT_Err_Ok: - sprintf( status.header_buffer, "%s %s (file `%s')", face->family_name, + sprintf( status.header_buffer, + "%.50s %.50s (file `%.100s')", face->family_name, face->style_name, basename ); break; case FT_Err_Invalid_Pixel_Size: - sprintf( status.header_buffer, "Invalid pixel size (file `%s')", + sprintf( status.header_buffer, "Invalid pixel size (file `%.100s')", basename ); break; case FT_Err_Invalid_PPem: - sprintf( status.header_buffer, "Invalid ppem value (file `%s')", + sprintf( status.header_buffer, "Invalid ppem value (file `%.100s')", basename ); break; default: - sprintf( status.header_buffer, "File `%s': error 0x%04x", basename, + sprintf( status.header_buffer, "File `%.100s': error 0x%04x", basename, (FT_UShort)error_code ); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.12/src/ftview.c new/ft2demos-2.4.1/src/ftview.c --- old/ft2demos-2.3.12/src/ftview.c 2009-04-30 20:08:25.000000000 +0200 +++ new/ft2demos-2.4.1/src/ftview.c 2010-06-07 08:51:22.000000000 +0200 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -38,7 +38,7 @@ #define INIT_SIZE( size, start_x, start_y, step_x, step_y, x, y ) \ do { \ start_x = 4; \ - start_y = CEIL( size->metrics.height ) + 2 * HEADER_HEIGHT; \ + start_y = CEIL( size->metrics.height ) + 3 * HEADER_HEIGHT; \ step_x = CEIL( size->metrics.max_advance ); \ step_y = CEIL( size->metrics.height ) + 4; \ \ @@ -70,28 +70,33 @@ static struct status_ { - int render_mode; - FT_Encoding encoding; - int res; - int ptsize; /* current point size, 26.6 format */ - int lcd_mode; - double gamma; - double bold_factor; - double slant; - - int debug; - int trace_level; - int font_index; - int dump_cache_stats; /* do we need to dump cache statistics? */ - int Num; /* current first index */ - char* header; - char header_buffer[256]; - int Fail; - int preload; + int render_mode; + FT_Encoding encoding; + int res; + int ptsize; /* current point size, 26.6 format */ + int lcd_mode; + double gamma; + double bold_factor; + double slant; + + int debug; + int trace_level; + int font_index; + int dump_cache_stats; /* do we need to dump cache statistics? */ + int Num; /* current first index */ + char* header; + char header_buffer[256]; + int Fail; + int preload; + + int use_custom_lcd_filter; + unsigned char filter_weights[5]; + int fw_index; } status = { RENDER_MODE_ALL, FT_ENCODING_NONE, 72, 48, -1, 1.0, 0.04, 0.22, - 0, 0, 0, 0, 0, NULL, { 0 }, 0, 0 }; + 0, 0, 0, 0, 0, NULL, { 0 }, 0, 0, + 0, "\x10\x40\x70\x40\x10", 2 }; static FTDemo_Display* display; @@ -445,7 +450,7 @@ status.Fail++; else if ( X_TOO_LONG( x, size, display ) ) { - x = start_x; + x = start_x; y += step_y; if ( Y_TOO_LONG( y, size, display ) ) @@ -565,7 +570,7 @@ } start_x = 4; - start_y = 2 * HEADER_HEIGHT; + start_y = 3 * HEADER_HEIGHT; for ( pt_size = first_size; pt_size < max_size; pt_size += 64 ) { @@ -644,43 +649,38 @@ grLn(); grWriteln( "Use the following keys:" ); grLn(); - grWriteln( " F1 or ? : display this help screen" ); + grWriteln( " F1, ? display this help screen" ); grLn(); - grWriteln( " a : toggle anti-aliasing" ); - grWriteln( " b : toggle embedded bitmaps" ); - grWriteln( " c : toggle between cache modes" ); - grWriteln( " f : toggle forced auto-hinting" ); - grWriteln( " h : toggle outline hinting" ); - grWriteln( " l : toggle low precision rendering" ); + grWriteln( " a toggle anti-aliasing" ); + grWriteln( " b toggle embedded bitmaps" ); + grWriteln( " c toggle between cache modes" ); + grWriteln( " f toggle forced auto-hinting" ); + grWriteln( " h toggle outline hinting" ); + grWriteln( " l toggle low precision rendering" ); grLn(); - grWriteln( " L : cycle through LCD modes" ); - grWriteln( " space : toggle rendering mode" ); - grWriteln( " 1-6 : select rendering mode" ); + grWriteln( " L cycle through LCD modes" ); + grWriteln( " space cycle through rendering modes" ); + grWriteln( " 1-6 select rendering mode" ); grLn(); - grWriteln( " e, E : adjust emboldening" ); - grWriteln( " s, S : adjust slanting" ); + grWriteln( " e, E adjust emboldening" ); + grWriteln( " s, S adjust slanting" ); grLn(); - grWriteln( " G : show gamma ramp" ); - grWriteln( " g : increase gamma by 0.1" ); - grWriteln( " v : decrease gamma by 0.1" ); + grWriteln( " F toggle custom LCD filter mode" ); + grWriteln( " [, ] select custom LCD filter weight" ); + grWriteln( " -, +(=) adjust selected custom LCD filter weight" ); grLn(); - grWriteln( " n : next font" ); - grWriteln( " p : previous font" ); + grWriteln( " G show gamma ramp" ); + grWriteln( " g, v adjust gamma value" ); grLn(); - grWriteln( " Up : increase pointsize by 1 unit" ); - grWriteln( " Down : decrease pointsize by 1 unit" ); - grWriteln( " Page Up : increase pointsize by 10 units" ); - grWriteln( " Page Down : decrease pointsize by 10 units" ); + grWriteln( " p, n select previous/next font" ); grLn(); - grWriteln( " Right : increment index" ); - grWriteln( " Left : decrement index" ); + grWriteln( " Up, Down adjust pointsize by 1 unit" ); + grWriteln( " PgUp, PgDn adjust pointsize by 10 units" ); grLn(); - grWriteln( " F7 : decrement index by 10" ); - grWriteln( " F8 : increment index by 10" ); - grWriteln( " F9 : decrement index by 100" ); - grWriteln( " F10 : increment index by 100" ); - grWriteln( " F11 : decrement index by 1000" ); - grWriteln( " F12 : increment index by 1000" ); + grWriteln( " Left, Right adjust index by 1" ); + grWriteln( " F7, F8 adjust index by 10" ); + grWriteln( " F9, F10 adjust index by 100" ); + grWriteln( " F11, F12 adjust index by 1000" ); grLn(); grWriteln( "press any key to exit this help screen" ); @@ -1058,8 +1058,67 @@ case grKeyF11: event_index_change( -1000 ); break; case grKeyF12: event_index_change( 1000 ); break; + case grKEY( 'F' ): + FTC_Manager_RemoveFaceID( handle->cache_manager, + handle->scaler.face_id ); + + status.use_custom_lcd_filter = !status.use_custom_lcd_filter; + if ( status.use_custom_lcd_filter ) + FT_Library_SetLcdFilterWeights( handle->library, + status.filter_weights ); + else + FT_Library_SetLcdFilterWeights( handle->library, + (unsigned char*)"\x10\x40\x70\x40\x10" ); + status.header = status.use_custom_lcd_filter + ? (char *)"using custom LCD filter weights" + : (char *)"using default LCD filter"; + break; + + case grKEY( '[' ): + if ( !status.use_custom_lcd_filter ) + break; + + status.fw_index--; + if ( status.fw_index < 0 ) + status.fw_index = 4; + break; + + case grKEY( ']' ): + if ( !status.use_custom_lcd_filter ) + break; + + status.fw_index++; + if ( status.fw_index > 4 ) + status.fw_index = 0; + break; + + case grKEY( '-' ): + if ( !status.use_custom_lcd_filter ) + break; + + FTC_Manager_RemoveFaceID( handle->cache_manager, + handle->scaler.face_id ); + + status.filter_weights[status.fw_index]--; + FT_Library_SetLcdFilterWeights( handle->library, + status.filter_weights ); + break; + + case grKEY( '+' ): + case grKEY( '=' ): + if ( !status.use_custom_lcd_filter ) + break; + + FTC_Manager_RemoveFaceID( handle->cache_manager, + handle->scaler.face_id ); + + status.filter_weights[status.fw_index]++; + FT_Library_SetLcdFilterWeights( handle->library, + status.filter_weights ); + break; + default: - ; + break; } return ret; @@ -1086,19 +1145,19 @@ switch ( error_code ) { case FT_Err_Ok: - sprintf( status.header_buffer, "%s %s (file `%s')", + sprintf( status.header_buffer, "%.50s %.50s (file `%.100s')", face->family_name, face->style_name, basename ); break; case FT_Err_Invalid_Pixel_Size: - sprintf( status.header_buffer, "Invalid pixel size (file `%s')", + sprintf( status.header_buffer, "Invalid pixel size (file `%.100s')", basename ); break; case FT_Err_Invalid_PPem: - sprintf( status.header_buffer, "Invalid ppem value (file `%s')", + sprintf( status.header_buffer, "Invalid ppem value (file `%.100s')", basename ); break; default: - sprintf( status.header_buffer, "File `%s': error 0x%04x", + sprintf( status.header_buffer, "File `%.100s': error 0x%04x", basename, (FT_UShort)error_code ); break; } @@ -1146,6 +1205,23 @@ grWriteCellString( display->bitmap, 0, HEADER_HEIGHT, status.header_buffer, display->fore_color ); + if ( status.use_custom_lcd_filter ) + { + int fwi = status.fw_index; + unsigned char *fw = status.filter_weights; + + + sprintf( status.header_buffer, + "%s0x%02X%s%s0x%02X%s%s0x%02X%s%s0x%02X%s%s0x%02X%s", + fwi == 0 ? "[" : " ", fw[0], fwi == 0 ? "]" : " ", + fwi == 1 ? "[" : " ", fw[1], fwi == 1 ? "]" : " ", + fwi == 2 ? "[" : " ", fw[2], fwi == 2 ? "]" : " ", + fwi == 3 ? "[" : " ", fw[3], fwi == 3 ? "]" : " ", + fwi == 4 ? "[" : " ", fw[4], fwi == 4 ? "]" : " " ); + grWriteCellString( display->bitmap, 0, 2 * HEADER_HEIGHT, + status.header_buffer, display->fore_color ); + } + grRefreshSurface( display->surface ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Fri Jul 30 12:35:43 CEST 2010. -------- --- util-linux/util-linux.changes 2010-06-24 23:25:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2010-07-09 09:15:50.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Jul 9 06:23:27 UTC 2010 - puzel(a)novell.com + +- update to util-linux-ng-2.18 + - do not provide rdev, ramsize, vidmode and rootflags commands + anymore + - fdisk does not use cylinders as display units by default + - libmount: new library; its API is still officially unstable + - new commands: findmnt, fsfreeze, swaplabel + - blkid: new option "-i" to print I/O limits + - full release notes: + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes +- update to adjtimex-1.28 +- update to which-2.20 +- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream) +- drop util-linux-addpart-use-atoll.patch (fixed upstream) +- drop util-linux-mount-detect-ro-mount.patch (fixed upstream) +- drop adjtimex-1.20-nosyscall.diff (fixed upstream) +- cleanup specfile a bit + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- adjtimex-1.20-nosyscall.diff adjtimex-1.20.tar.bz2 util-linux-2.14.1-mount_skip_sync.patch util-linux-addpart-use-atoll.patch util-linux-mount-detect-ro-mount.patch util-linux-ng-2.17.2.tar.bz2 which-2.19.tar.bz2 New: ---- adjtimex-1.28.tar.bz2 util-linux-ng-2.18.tar.bz2 which-2.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:00.000000000 +0200 +++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package util-linux (Version 2.17.2) +# spec file for package util-linux (Version 2.18) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,31 +16,40 @@ # +%define time_ver 1.7 +%define which_ver 2.20 +%define adjtimex_ver 1.28 Name: util-linux -BuildRequires: audit-devel gettext-devel pkg-config -BuildRequires: libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel +BuildRequires: audit-devel +BuildRequires: gettext-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: ncurses-devel +BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: zlib-devel Url: http://userweb.kernel.org/~kzak/util-linux-ng/ Supplements: filesystem(minix) PreReq: %install_info_prereq permissions License: GPLv2+ Group: System/Base AutoReqProv: on -Version: 2.17.2 -Release: 5 +Version: 2.18 +Release: 1 Recommends: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{v… Source1: util-linux-rpmlintrc +# XXX: make nologin part of login package Source2: nologin.c Source3: nologin.8 Source4: raw.init Source5: etc.raw Source6: etc_filesystems +# XXX: add libmnt Source7: baselibs.conf -%define time_ver 1.7 -%define which_ver 2.19 -%define adjtimex_ver 1.20 # XXX: post upstream? Source9: adjtimex-%{adjtimex_ver}.tar.bz2 # XXX: post upstream? @@ -66,20 +75,13 @@ ## # 241372 - remove legacy warnings from fdisk Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch -# bnc#447036 -Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch Patch4: util-linux-2.17.1-losetup-honor-documented-c-option -# 603328 -Patch5: util-linux-addpart-use-atoll.patch -# bnc#481123 -Patch6: util-linux-mount-detect-ro-mount.patch Patch7: util-linux-swapon-btrfs-limitations ## ## adjtimex ## -Patch50: adjtimex-1.20-nosyscall.diff ## ## klogconsole ## @@ -96,8 +98,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed # -Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} schedutils = %{version}-%{release} uuid-runtime = %{version}-%{release} -Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} schedutils < %{version}-%{release} uuid-runtime < %{version}-%{release} +Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} uuid-runtime = %{version}-%{release} +Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} uuid-runtime < %{version}-%{release} %description This package contains a large variety of low-level system utilities @@ -118,7 +120,7 @@ Summary: Development files for the filesystem detection library Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libblkid1 = %version libuuid-devel +Requires: libblkid1 = %version %description -n libblkid-devel Files needed to develop applications using the library for filesystem @@ -156,27 +158,44 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). +%package -n libmount1 +License: GPLv2+ +Summary: Mount library +Group: System/Filesystems +AutoReqProv: on + +%description -n libmount1 +Library designed to be used in low-level utils like +mount(8) and /sbin/mount.<type> helpers. + +%package -n libmount-devel +License: GPLv2+ +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +AutoReqProv: on +Requires: libmount1 = %version + +%description -n libmount-devel +Files to develop applications using the libmount library. + %lang_package %prep %setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version -#patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch7 -p1 # cd adjtimex-* -%patch50 -p1 +# adjtimex patches belongs here cd - # setctsid cp %{S:22} %{S:23} . # nologin cp %{S:2} %{S:3} %{S:26} %{S:30} . cd ../klogconsole -%patch55 -p1 -b .quiet +#%#patch55 -p1 -b .quiet +%patch55 -p1 %patch56 -p1 cd ../time-* %patch60 @@ -187,12 +206,11 @@ # adjtimex build cd adjtimex-%{adjtimex_ver} CFLAGS="$RPM_OPT_FLAGS" ./configure -make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. pushd ../ # which build cd which-%{which_ver} -#autoreconf -fi aclocal --force autoconf --force automake --force-missing --add-missing --foreign @@ -201,7 +219,7 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux -make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. # time build cd time-%{time_ver} @@ -211,16 +229,16 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux -make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. # klogconsole build cd klogconsole -make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" cd .. popd # setctsid build rm -f setctsid -make %{?jobs:-j%jobs} setctsid CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} setctsid CFLAGS="$RPM_OPT_FLAGS" # # util-linux itself # @@ -243,11 +261,8 @@ --enable-write \ --disable-use-tty-group \ --disable-static \ -%ifarch %ix86 x86_64 - --enable-rdev \ -%endif # -make %{?jobs:-j%jobs} +make %{?_smp_mflags} # gcc $RPM_OPT_FLAGS -o nologin nologin.c gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29} @@ -300,6 +315,7 @@ install -m 755 nologin $RPM_BUILD_ROOT/sbin rm -f $RPM_BUILD_ROOT/%{_libdir}/libblkid.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libuuid.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libmount.la %ifnarch ppc ppc64 install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8 @@ -385,6 +401,12 @@ %postun -n libblkid1 /sbin/ldconfig +%post -n libmount1 +/sbin/ldconfig + +%postun -n libmount1 +/sbin/ldconfig + %pre -n uuidd /usr/sbin/groupadd -r uuidd 2>/dev/null || : /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ @@ -432,6 +454,7 @@ /bin/more /bin/mount /bin/umount +/bin/findmnt /sbin/adjtimex /sbin/agetty /sbin/blockdev @@ -455,6 +478,8 @@ /sbin/fsck /sbin/switch_root /sbin/wipefs +/sbin/fsfreeze +/sbin/swaplabel /usr/bin/ipcmk /bin/logger /usr/bin/cal @@ -473,8 +498,6 @@ /usr/bin/ipcs /usr/bin/isosize /usr/bin/line -#/usr/bin/linux32 -#/usr/bin/linux64 /usr/bin/look /usr/bin/lscpu /usr/bin/mcookie @@ -573,13 +596,14 @@ %{_mandir}/man8/fsck.minix.8.gz %{_mandir}/man8/isosize.8.gz %{_mandir}/man8/ldattach.8.gz -#%{_mandir}/man8/linux32.8.gz -#%{_mandir}/man8/linux64.8.gz %{_mandir}/man8/losetup.8.gz %{_mandir}/man8/mkfs.8.gz %{_mandir}/man8/mkswap.8.gz %{_mandir}/man8/mount.8.gz %{_mandir}/man8/nologin.8.gz +%{_mandir}/man8/findmnt.8.gz +%{_mandir}/man8/fsfreeze.8.gz +%{_mandir}/man8/swaplabel.8.gz %ifnarch ppc ppc64 %{_mandir}/man8/mkzimage_cmdline.8.gz %endif @@ -600,7 +624,6 @@ %attr (755,root,root) /usr/share/getopt/getopt-parse.tcsh %attr (755,root,root) /usr/share/getopt/getopt-test.bash %attr (755,root,root) /usr/share/getopt/getopt-test.tcsh -#/usr/share/locale/*/LC_MESSAGES/util-linux-ng.mo %ifnarch ia64 %doc fdisk/README.fdisk /sbin/fdisk @@ -613,18 +636,7 @@ /sbin/cfdisk /sbin/sfdisk %endif -%ifarch %ix86 x86_64 -/usr/sbin/ramsize -/usr/sbin/rdev -/usr/sbin/rootflags -/usr/sbin/vidmode -%{_mandir}/man8/ramsize.8.gz -%{_mandir}/man8/rdev.8.gz -%{_mandir}/man8/rootflags.8.gz -%{_mandir}/man8/vidmode.8.gz -%endif %ifnarch s390 s390x -#%config(noreplace) /etc/fdprm /usr/bin/cytune /usr/sbin/fdformat /sbin/hwclock @@ -637,35 +649,6 @@ %{_mandir}/man8/klogconsole.8.gz %{_mandir}/man8/tunelp.8.gz %endif -# setarch links -#%ifarch %ix86 x86_64 -#/usr/bin/i386 -#%{_mandir}/man8/i386.8.gz -#%endif -#%ifarch x86_64 -#/usr/bin/x86_64 -#%{_mandir}/man8/x86_64.8.gz -#%endif -#%ifarch s390 s390x -#/usr/bin/s390 -#/usr/bin/s390x -#%{_mandir}/man8/s390.8.gz -#%{_mandir}/man8/s390x.8.gz -#%endif -#%ifarch ppc ppc64 -#/usr/bin/ppc -#/usr/bin/ppc32 -#/usr/bin/ppc64 -#%{_mandir}/man8/ppc.8.gz -#%{_mandir}/man8/ppc32.8.gz -#%{_mandir}/man8/ppc64.8.gz -#%endif -#%ifarch ia64 -#/usr/bin/i386 -#/usr/bin/ia64 -#%{_mandir}/man8/i386.8.gz -#%{_mandir}/man8/ia64.8.gz -#%endif %files -n libblkid1 %defattr(-, root, root) @@ -680,6 +663,18 @@ %_libdir/pkgconfig/blkid.pc %{_mandir}/man3/libblkid.3.gz +%files -n libmount1 +%defattr(-, root, root) +/%{_lib}/libmount.so.1 +/%{_lib}/libmount.so.1.* + +%files -n libmount-devel +%defattr(-, root, root) +%{_libdir}/libmount.so +%dir %{_includedir}/mount +%{_includedir}/mount/mount.h +%_libdir/pkgconfig/mount.pc + %files -n uuidd %defattr(-, root, root) %verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd ++++++ adjtimex-1.20.tar.bz2 -> adjtimex-1.28.tar.bz2 ++++++ ++++ 8702 lines of diff (skipped) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200 +++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200 @@ -2,12 +2,11 @@ libuuid-devel requires -libuuid-<targettype> requires "libuuid1-<targettype> = <version>" - requires -libblkid-<targettype> - requires "libblkid1-<targettype> = <version>" libblkid1 - obsoletes "e2fsprogs-<targettype> <= <version>" libblkid-devel requires -libblkid-<targettype> requires "libblkid1-<targettype> = <version>" - requires -libuuid-<targettype> - requires "libuuid1-<targettype> = <version>" +libmount1 +libmount-devel + requires -libmount-<targettype> + requires "libmount1-<targettype> = <version>" ++++++ util-linux-2.12r-fdisk_remove_bogus_warnings.patch ++++++ --- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200 +++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200 @@ -1,8 +1,8 @@ -Index: util-linux-ng-2.16/fdisk/fdisk.c +Index: util-linux-ng-2.18/fdisk/fdisk.c =================================================================== ---- util-linux-ng-2.16.orig/fdisk/fdisk.c -+++ util-linux-ng-2.16/fdisk/fdisk.c -@@ -1586,6 +1586,7 @@ static void check_consistency(struct par +--- util-linux-ng-2.18.orig/fdisk/fdisk.c 2010-06-30 14:44:25.000000000 +0200 ++++ util-linux-ng-2.18/fdisk/fdisk.c 2010-07-08 14:35:07.000000000 +0200 +@@ -1838,6 +1838,7 @@ static void check_consistency(struct par /* compute logical ending (c, h, s) */ long2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les); @@ -10,7 +10,7 @@ /* Same physical / logical beginning? */ if (cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) { printf(_("Partition %d has different physical/logical " -@@ -1602,7 +1603,6 @@ static void check_consistency(struct par +@@ -1854,7 +1855,6 @@ static void check_consistency(struct par printf(_("logical=(%d, %d, %d)\n"),lec, leh, les); } ++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++ --- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200 +++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200 @@ -38,24 +38,23 @@ create mode 100644 mount/sha512.c create mode 100644 mount/sha512.h -diff --git a/mount/Makefile.am b/mount/Makefile.am -index c5f58aa..43ff01a 100644 ---- a/mount/Makefile.am -+++ b/mount/Makefile.am -@@ -7,7 +7,8 @@ sbin_PROGRAMS = losetup swapon +Index: util-linux-ng-2.18/mount/Makefile.am +=================================================================== +--- util-linux-ng-2.18.orig/mount/Makefile.am 2010-05-24 12:35:47.000000000 +0200 ++++ util-linux-ng-2.18/mount/Makefile.am 2010-07-08 14:39:01.000000000 +0200 +@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 # generic sources for all programs (mount, umount, losetup) --srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h -+srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h \ -+ rmd160.c sha512.c +-srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h ++srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c sha512.c # generic header for mount and umount hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ -diff --git a/mount/lomount.c b/mount/lomount.c -index 67712c6..a0b951c 100644 ---- a/mount/lomount.c -+++ b/mount/lomount.c +Index: util-linux-ng-2.18/mount/lomount.c +=================================================================== +--- util-linux-ng-2.18.orig/mount/lomount.c 2010-05-19 23:36:23.000000000 +0200 ++++ util-linux-ng-2.18/mount/lomount.c 2010-07-08 14:39:29.000000000 +0200 @@ -23,6 +23,12 @@ #include "sundries.h" #include "xmalloc.h" @@ -143,7 +142,7 @@ char *filename; if (verbose) { -@@ -707,13 +742,37 @@ set_loop(const char *device, const char *file, unsigned long long offset, +@@ -707,13 +742,37 @@ set_loop(const char *device, const char filename = (char *) file; xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE); @@ -183,7 +182,7 @@ } } -@@ -734,20 +793,70 @@ set_loop(const char *device, const char *file, unsigned long long offset, +@@ -734,20 +793,70 @@ set_loop(const char *device, const char } #endif @@ -266,7 +265,7 @@ } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { -@@ -895,7 +1004,13 @@ usage(void) { +@@ -897,7 +1006,13 @@ usage(void) { fprintf(stderr, _("\nOptions:\n" " -e | --encryption <type> enable data encryption with specified <name/num>\n" @@ -280,7 +279,7 @@ " -o | --offset <num> start at offset <num> into file\n" " --sizelimit <num> loop limited to only <num> bytes of the file\n" " -p | --pass-fd <num> read passphrase from file descriptor <num>\n" -@@ -908,11 +1023,14 @@ usage(void) { +@@ -910,11 +1025,14 @@ usage(void) { int main(int argc, char **argv) { char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc; @@ -292,10 +291,10 @@ int ro = 0; int pfd = -1; + int keysz = 0; - unsigned long long off, slimit; + uintmax_t off = 0, slimit = 0; struct option longopts[] = { { "all", 0, 0, 'a' }, -@@ -921,6 +1039,8 @@ main(int argc, char **argv) { +@@ -923,6 +1041,8 @@ main(int argc, char **argv) { { "encryption", 1, 0, 'e' }, { "find", 0, 0, 'f' }, { "help", 0, 0, 'h' }, @@ -305,8 +304,8 @@ { "offset", 1, 0, 'o' }, { "sizelimit", 1, 0, 128 }, @@ -939,12 +1059,13 @@ main(int argc, char **argv) { - off = 0; - slimit = 0; + + capacity = delete = find = all = 0; assoc = offset = sizelimit = encryption = passfd = NULL; + keysize = NULL; @@ -332,7 +331,7 @@ case 'o': offset = optarg; break; -@@ -1054,8 +1181,11 @@ main(int argc, char **argv) { +@@ -1058,8 +1185,11 @@ main(int argc, char **argv) { else { if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(); @@ -345,10 +344,10 @@ if (res == 2 && find) { if (verbose) printf(_("stolen loop=%s...trying again\n"), -diff --git a/mount/lomount.h b/mount/lomount.h -index 59108d4..07ab875 100644 ---- a/mount/lomount.h -+++ b/mount/lomount.h +Index: util-linux-ng-2.18/mount/lomount.h +=================================================================== +--- util-linux-ng-2.18.orig/mount/lomount.h 2010-02-04 12:53:56.000000000 +0100 ++++ util-linux-ng-2.18/mount/lomount.h 2010-07-08 14:38:38.000000000 +0200 @@ -1,5 +1,6 @@ -extern int set_loop(const char *, const char *, unsigned long long, unsigned long long, - const char *, int, int *); @@ -358,11 +357,11 @@ extern int del_loop(const char *); extern int is_loop_device(const char *); extern int is_loop_autoclear(const char *device); -diff --git a/mount/losetup.8 b/mount/losetup.8 -index 8ccab6c..8566898 100644 ---- a/mount/losetup.8 -+++ b/mount/losetup.8 -@@ -92,9 +92,18 @@ find the first unused loop device. If a +Index: util-linux-ng-2.18/mount/losetup.8 +=================================================================== +--- util-linux-ng-2.18.orig/mount/losetup.8 2010-05-19 23:36:23.000000000 +0200 ++++ util-linux-ng-2.18/mount/losetup.8 2010-07-08 14:38:38.000000000 +0200 +@@ -96,9 +96,18 @@ find the first unused loop device. If a argument is present, use this device. Otherwise, print its name .IP "\fB\-h, \-\-help\fP" print help @@ -381,7 +380,7 @@ .IP "\fB\-o, \-\-offset \fIoffset\fP" the data start is moved \fIoffset\fP bytes into the specified file or device -@@ -165,6 +174,8 @@ the command +@@ -169,6 +178,8 @@ the command .fi .SH RESTRICTION DES encryption is painfully slow. On the other hand, XOR is terribly weak. @@ -390,11 +389,11 @@ Cryptoloop is deprecated in favor of dm-crypt. For more details see .BR cryptsetup (8). -diff --git a/mount/mount.8 b/mount/mount.8 -index 2888b46..582898a 100644 ---- a/mount/mount.8 -+++ b/mount/mount.8 -@@ -826,6 +826,15 @@ Every time the inode is modified, the i_version field will be incremented. +Index: util-linux-ng-2.18/mount/mount.8 +=================================================================== +--- util-linux-ng-2.18.orig/mount/mount.8 2010-06-30 10:41:35.000000000 +0200 ++++ util-linux-ng-2.18/mount/mount.8 2010-07-08 14:38:38.000000000 +0200 +@@ -869,6 +869,15 @@ Every time the inode is modified, the i_ .B noiversion Do not increment the i_version inode field. .TP @@ -410,7 +409,7 @@ .B mand Allow mandatory locks on this filesystem. See .BR fcntl (2). -@@ -2525,6 +2534,10 @@ that are really options to +@@ -2582,6 +2591,10 @@ that are really options to .BR \%losetup (8). (These options can be used in addition to those specific to the filesystem type.) @@ -419,13 +418,13 @@ +.BR \-\-pass-fd +option. - If no explicit loop device is mentioned - (but just an option `\fB\-o loop\fP' is given), then -diff --git a/mount/mount.c b/mount/mount.c -index efe1165..09006f7 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -95,6 +95,9 @@ struct mountargs { + Since Linux 2.6.25 is supported auto-destruction of loop devices and + then any loop device allocated by +Index: util-linux-ng-2.18/mount/mount.c +=================================================================== +--- util-linux-ng-2.18.orig/mount/mount.c 2010-06-30 12:51:09.000000000 +0200 ++++ util-linux-ng-2.18/mount/mount.c 2010-07-08 14:38:38.000000000 +0200 +@@ -96,6 +96,9 @@ struct mountargs { void *data; }; @@ -435,7 +434,7 @@ /* Map from -o and fstab option strings to the flag argument to mount(2). */ struct opt_map { const char *opt; /* option name */ -@@ -200,6 +203,7 @@ static int opt_nofail = 0; +@@ -201,6 +204,7 @@ static int opt_nofail = 0; static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit, *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper; @@ -443,7 +442,7 @@ static int is_readonly(const char *node); static int mounted (const char *spec0, const char *node0); -@@ -216,6 +220,8 @@ static struct string_opt_map { +@@ -217,6 +221,8 @@ static struct string_opt_map { { "offset=", 0, &opt_offset }, { "sizelimit=", 0, &opt_sizelimit }, { "encryption=", 0, &opt_encryption }, @@ -452,7 +451,7 @@ { "speed=", 0, &opt_speed }, { "comment=", 1, &opt_comment }, { "uhelper=", 0, &opt_uhelper }, -@@ -1081,7 +1087,8 @@ loop_check(const char **spec, const char **type, int *flags, +@@ -1116,7 +1122,8 @@ loop_check(const char **spec, const char *type = opt_vfstype; } @@ -461,8 +460,8 @@ + opt_encryption || opt_phash || opt_keybits); *loopfile = *spec; - if (*loop) { -@@ -1113,7 +1120,7 @@ loop_check(const char **spec, const char **type, int *flags, + /* Automatically create a loop device from a regular file if a filesystem +@@ -1170,7 +1177,7 @@ loop_check(const char **spec, const char printf(_("mount: going to use the loop device %s\n"), *loopdev); if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit, @@ -471,7 +470,7 @@ if (res == 2) { /* loop dev has been grabbed by some other process, try again, if not given explicitly */ -@@ -1920,6 +1927,7 @@ static struct option longopts[] = { +@@ -1981,6 +1988,7 @@ static struct option longopts[] = { { "options", 1, 0, 'o' }, { "test-opts", 1, 0, 'O' }, { "pass-fd", 1, 0, 'p' }, @@ -479,7 +478,7 @@ { "types", 1, 0, 't' }, { "bind", 0, 0, 'B' }, { "move", 0, 0, 'M' }, -@@ -2082,6 +2090,7 @@ main(int argc, char *argv[]) { +@@ -2143,6 +2151,7 @@ main(int argc, char *argv[]) { char *options = NULL, *test_opts = NULL, *node; const char *spec = NULL; char *label = NULL; @@ -487,7 +486,7 @@ char *uuid = NULL; char *types = NULL; char *p; -@@ -2112,7 +2121,7 @@ main(int argc, char *argv[]) { +@@ -2173,7 +2182,7 @@ main(int argc, char *argv[]) { initproctitle(argc, argv); #endif @@ -496,7 +495,7 @@ longopts, NULL)) != -1) { switch (c) { case 'a': /* mount everything in fstab */ -@@ -2133,6 +2142,9 @@ main(int argc, char *argv[]) { +@@ -2194,6 +2203,9 @@ main(int argc, char *argv[]) { case 'i': external_allowed = 0; break; @@ -506,7 +505,7 @@ case 'l': list_with_volumelabel = 1; break; -@@ -2280,6 +2292,9 @@ main(int argc, char *argv[]) { +@@ -2341,6 +2353,9 @@ main(int argc, char *argv[]) { atexit(unlock_mtab); @@ -516,11 +515,10 @@ switch (argc+specseen) { case 0: /* mount -a */ -diff --git a/mount/rmd160.c b/mount/rmd160.c -new file mode 100644 -index 0000000..3430954 ---- /dev/null -+++ b/mount/rmd160.c +Index: util-linux-ng-2.18/mount/rmd160.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ util-linux-ng-2.18/mount/rmd160.c 2010-07-08 14:38:38.000000000 +0200 @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. @@ -1054,11 +1052,10 @@ + rmd160_final( &hd ); + memcpy( outbuf, hd.buf, 20 ); +} -diff --git a/mount/rmd160.h b/mount/rmd160.h -new file mode 100644 -index 0000000..4b2c61d ---- /dev/null -+++ b/mount/rmd160.h +Index: util-linux-ng-2.18/mount/rmd160.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ util-linux-ng-2.18/mount/rmd160.h 2010-07-08 14:38:38.000000000 +0200 @@ -0,0 +1,11 @@ +#ifndef RMD160_H +#define RMD160_H @@ -1071,11 +1068,10 @@ +#endif /*RMD160_H*/ + + -diff --git a/mount/sha512.c b/mount/sha512.c -new file mode 100644 -index 0000000..f717c8b ---- /dev/null -+++ b/mount/sha512.c +Index: util-linux-ng-2.18/mount/sha512.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ util-linux-ng-2.18/mount/sha512.c 2010-07-08 14:38:38.000000000 +0200 @@ -0,0 +1,432 @@ +/* + * sha512.c @@ -1509,11 +1505,10 @@ + memset(&ctx, 0, sizeof(ctx)); +} +#endif -diff --git a/mount/sha512.h b/mount/sha512.h -new file mode 100644 -index 0000000..4b57c01 ---- /dev/null -+++ b/mount/sha512.h +Index: util-linux-ng-2.18/mount/sha512.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ util-linux-ng-2.18/mount/sha512.h 2010-07-08 14:38:38.000000000 +0200 @@ -0,0 +1,45 @@ +/* + * sha512.h @@ -1560,6 +1555,3 @@ +/* no sha384_write(), use sha512_write() */ +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */ +extern void sha384_hash_buffer(const unsigned char *, size_t, unsigned char *, size_t); --- -1.6.4.2 - ++++++ util-linux-ng-2.17.2.tar.bz2 -> util-linux-ng-2.18.tar.bz2 ++++++ util-linux/util-linux-ng-2.17.2.tar.bz2 /mounts/work_src_done/STABLE/util-linux/util-linux-ng-2.18.tar.bz2 differ: char 11, line 1 ++++++ util-linux-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200 +++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200 @@ -1,5 +1,4 @@ addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/raw") addFilter("incoherent-init-script-name raw") addFilter("no-reload-entry /etc/init.d/raw") -addFilter("files-duplicate .*(rootflags|ramsize|vidmode)") ++++++ which-2.19.tar.bz2 -> which-2.20.tar.bz2 ++++++ ++++ 2407 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/EXAMPLES new/which-2.20/EXAMPLES --- old/which-2.19/EXAMPLES 2008-01-18 19:12:06.000000000 +0100 +++ new/which-2.20/EXAMPLES 2008-08-06 17:22:13.000000000 +0200 @@ -36,7 +36,7 @@ Report bugs to <which-bugs(a)gnu.org>. >which --version -GNU which v2.19, Copyright (C) 1999 - 2008 Carlo Wood. +GNU which v2.20, Copyright (C) 1999 - 2008 Carlo Wood. GNU which comes with ABSOLUTELY NO WARRANTY; This program is free software; your freedom to use, change and distribute this program is protected by the GPL. @@ -154,7 +154,7 @@ >id uid=1000(carlo) gid=1000(carlo) groups=20(dialout),24(cdrom),25(floppy),29(audio),44(video),46(plugdev),106(netdev),109(powerdev),115(kvm),1000(carlo) >ls -l xxx --rwx------ 1 root carlo 0 2008-01-18 19:12 xxx +-rwx------ 1 root carlo 0 2008-08-06 17:22 xxx >su >chmod 750 xxx >chgrp carlo xxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/NEWS new/which-2.20/NEWS --- old/which-2.19/NEWS 2008-01-18 19:11:27.000000000 +0100 +++ new/which-2.20/NEWS 2008-03-11 06:42:09.000000000 +0100 @@ -1,3 +1,9 @@ +Version 2.19 --> 2.20 + +* xmalloc.h included a readline header for no apparent reason. The compilation + failed if readline was not installed. The dependency on the readline header + was removed. Submitted by Tushar Teredesai. + Version 2.18 --> 2.19 * Upgraded code from bash to version 3.2. This DOES has influence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/configure.ac new/which-2.20/configure.ac --- old/which-2.19/configure.ac 2008-01-16 17:55:28.000000000 +0100 +++ new/which-2.20/configure.ac 2008-03-11 06:42:31.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(which.c) -AM_INIT_AUTOMAKE(which, 2.19) +AM_INIT_AUTOMAKE(which, 2.20) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/missing new/which-2.20/missing --- old/which-2.19/missing 2006-11-27 03:51:30.000000000 +0100 +++ new/which-2.20/missing 2008-02-10 03:55:24.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/stamp-vti new/which-2.20/stamp-vti --- old/which-2.19/stamp-vti 2008-01-16 18:35:42.000000000 +0100 +++ new/which-2.20/stamp-vti 2008-08-06 17:20:48.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 16 January 2008 @set UPDATED-MONTH January 2008 -@set EDITION 2.19 -@set VERSION 2.19 +@set EDITION 2.20 +@set VERSION 2.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/tilde/xmalloc.h new/which-2.20/tilde/xmalloc.h --- old/which-2.19/tilde/xmalloc.h 2008-01-16 17:07:57.000000000 +0100 +++ new/which-2.20/tilde/xmalloc.h 2008-03-11 06:38:00.000000000 +0100 @@ -23,12 +23,6 @@ #if !defined (_XMALLOC_H_) #define _XMALLOC_H_ -#if defined (READLINE_LIBRARY) -# include "rlstdc.h" -#else -# include <readline/rlstdc.h> -#endif - #ifndef PTR_T #ifdef __STDC__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/version.texi new/which-2.20/version.texi --- old/which-2.19/version.texi 2008-01-16 17:59:02.000000000 +0100 +++ new/which-2.20/version.texi 2008-08-06 17:20:48.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 16 January 2008 @set UPDATED-MONTH January 2008 -@set EDITION 2.19 -@set VERSION 2.19 +@set EDITION 2.20 +@set VERSION 2.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/which.info new/which-2.20/which.info --- old/which-2.19/which.info 2008-01-16 18:35:42.000000000 +0100 +++ new/which-2.20/which.info 2008-08-06 17:20:56.000000000 +0200 @@ -27,7 +27,7 @@ The `which' program shows the full path of (shell) commands. -This file documents `which' version 2.19, updated 16 January 2008. +This file documents `which' version 2.20, updated 16 January 2008. * Menu: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openssl for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at Fri Jul 30 12:35:12 CEST 2010. -------- --- openssl/openssl.changes 2010-06-30 10:48:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/openssl/openssl.changes 2010-07-28 22:55:55.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 28 20:55:18 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Exclude static libraries, see what breaks and fix that + instead + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.zlj17V/_old 2010-07-30 12:34:55.000000000 +0200 +++ /var/tmp/diff_new_pack.zlj17V/_new 2010-07-30 12:34:55.000000000 +0200 @@ -32,7 +32,7 @@ %endif # Version: 1.0.0 -Release: 6 +Release: 9 Summary: Secure Sockets and Transport Layer Security Url: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 @@ -379,8 +379,8 @@ %defattr(-, root, root) %{_includedir}/%{name}/ %{_includedir}/ssl -%{_libdir}/libcrypto.a -%{_libdir}/libssl.a +%exclude %{_libdir}/libcrypto.a +%exclude %{_libdir}/libssl.a %{_libdir}/libssl.so %{_libdir}/libcrypto.so %_libdir/pkgconfig/libcrypto.pc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0