May 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libesmtp for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package libesmtp for openSUSE:Factory checked in at Mon May 3 21:37:19 CEST 2010. -------- --- GNOME/libesmtp/libesmtp.changes 2008-08-06 17:08:23.000000000 +0200 +++ libesmtp/libesmtp.changes 2010-05-03 17:04:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 28 08:16:43 UTC 2010 - freitag(a)novell.com + +- Add libestmp-commonname.diff to do stricter check on commonName + bnc#585393. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libestmp-commonname.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libesmtp.spec ++++++ --- /var/tmp/diff_new_pack.CCXjqY/_old 2010-05-03 21:36:24.000000000 +0200 +++ /var/tmp/diff_new_pack.CCXjqY/_new 2010-05-03 21:36:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libesmtp (Version 1.0.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,16 +21,18 @@ Name: libesmtp BuildRequires: openssl-devel Url: http://www.stafford.uklinux.net/libesmtp/ -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: A Library for Posting Electronic Mail Version: 1.0.4 -Release: 157 +Release: 171 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Patch0: libesmtp-removedecls.diff Patch1: libesmtp-1.0.4-bloat.patch Patch2: libesmtp-1.0.4-multiple-cc.patch +# PATCH-FIX-UPSTREAM libestmp-commonname.diff bnc#585393 freitag(a)novell.com -- Stricter checking on CommonName +Patch3: libestmp-commonname.diff %description libESMTP is a library to manage posting (or submission of) electronic @@ -46,7 +48,7 @@ Brian Stafford <brian(a)stafford.uklinux.net> %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: A Library for Posting Electronic Mail Group: Development/Libraries/C and C++ Requires: libesmtp = %{version} @@ -69,6 +71,7 @@ %patch0 %patch1 %patch2 -p1 +%patch3 %build autoreconf -fi ++++++ libestmp-commonname.diff ++++++ --- smtp-tls.c.orig 2005-12-15 18:59:49.000000000 +0000 +++ smtp-tls.c 2010-03-17 01:15:06.000000000 +0000 @@ -439,15 +439,32 @@ match_component (const char *dom, const char *edom, const char *ref, const char *eref) { - while (dom < edom && ref < eref) + /* If ref is the single character '*' then accept this as a wildcard + matching any valid domainname component, i.e. characters from the + range A-Z, a-z, 0-9, - or _ + NB this is more restrictive than RFC 2818 which allows multiple + wildcard characters in the component pattern */ + if (eref == ref + 1 && *ref == '*') + while (dom < edom) + { + if (!(isalnum (*dom) || *dom == '-' /*|| *dom == '_'*/)) + return 0; + dom++; + } + else { - /* Accept a final '*' in the reference as a wildcard */ - if (*ref == '*' && ref + 1 == eref) - break; - /* compare the domain name case insensitive */ - if (!(*dom == *ref || tolower (*dom) == tolower (*ref))) - return 0; - ref++, dom++; + while (dom < edom && ref < eref) + { + /* check for valid domainname character */ + if (!(isalnum (*dom) || *dom == '-' /*|| *dom == '_'*/)) + return 0; + /* compare the domain name case-insensitively */ + if (!(*dom == *ref || tolower (*dom) == tolower (*ref))) + return 0; + ref++, dom++; + } + if (dom < edom || ref < eref) + return 0; } return 1; } @@ -541,65 +560,83 @@ } else { - int i, j, extcount; + char buf[256] = { 0 }; + STACK_OF(GENERAL_NAME) *altnames; + int hasaltname = 0; - extcount = X509_get_ext_count (cert); - for (i = 0; i < extcount; i++) + altnames = X509_get_ext_d2i (cert, NID_subject_alt_name, NULL, NULL); + if (altnames != NULL) { - const char *extstr; - X509_EXTENSION *ext = X509_get_ext (cert, i); + int i; - extstr = OBJ_nid2sn (OBJ_obj2nid (X509_EXTENSION_get_object (ext))); - if (strcmp (extstr, "subjectAltName") == 0) + for (i = 0; i < sk_GENERAL_NAME_num (altnames); ++i) { - unsigned char *data; - STACK_OF(CONF_VALUE) *val; - CONF_VALUE *nval; - X509V3_EXT_METHOD *meth; - void *ext_str = NULL; - int stack_len; - - meth = X509V3_EXT_get (ext); - if (meth == NULL) - break; - data = ext->value->data; -#if (OPENSSL_VERSION_NUMBER > 0x00907000L) - if (meth->it) - ext_str = ASN1_item_d2i (NULL, &data, ext->value->length, - ASN1_ITEM_ptr (meth->it)); - else -#endif - ext_str = meth->d2i (NULL, &data, ext->value->length); - val = meth->i2v (meth, ext_str, NULL); - stack_len = sk_CONF_VALUE_num (val); - for (j = 0; j < stack_len; j++) + GENERAL_NAME *name = sk_GENERAL_NAME_value (altnames, i); + + if (name->type == GEN_DNS) { - nval = sk_CONF_VALUE_value (val, j); - if (strcmp (nval->name, "DNS") == 0 - && match_domain (session->host, nval->value)) + const char *ia5str = (const char *) name->d.ia5->data; + int ia5len = name->d.ia5->length; + + hasaltname = 1; + if (strlen (ia5str) == ia5len + && match_domain (session->host, ia5str)) + ok = 1; + else { - ok = 1; - break; + buf[0] = '\0'; + strncat (buf, ia5str, sizeof buf - 1); } } + // TODO: handle GEN_IPADD } - if (ok) - break; + sk_GENERAL_NAME_pop_free (altnames, GENERAL_NAME_free); } - if (!ok) + + if (!hasaltname) { - /* Matching by subjectAltName failed, try commonName */ - X509_NAME_get_text_by_NID (X509_get_subject_name (cert), - NID_commonName, buf, sizeof buf); - if (!match_domain (session->host, buf) != 0) + X509_NAME *subj = X509_get_subject_name (cert); + + if (subj != NULL) { - if (session->event_cb != NULL) - (*session->event_cb) (session, SMTP_EV_WRONG_PEER_CERTIFICATE, - session->event_cb_arg, &ok, buf, ssl); + ASN1_STRING *cn; + int idx, i = -1; + + do + { + idx = i; + i = X509_NAME_get_index_by_NID (subj, NID_commonName, i); + } + while (i >= 0); + + if (idx >= 0 + && (cn = X509_NAME_ENTRY_get_data ( + X509_NAME_get_entry (subj, idx) + )) != NULL) + { + unsigned char *str = NULL; + int len = ASN1_STRING_to_UTF8 (&str, cn); + + if (str != NULL) + { + if (strlen ((char *) str) == len + && match_domain (session->host, (char *) str)) + ok = 1; + else + { + buf[0] = '\0'; + strncat (buf, (char *) str, sizeof buf - 1); + } + OPENSSL_free (str); + } + } } - else - ok = 1; } + + if (!ok && session->event_cb != NULL) + (*session->event_cb) (session, SMTP_EV_WRONG_PEER_CERTIFICATE, + session->event_cb_arg, &ok, buf, ssl); + X509_free (cert); } return ok; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pm-utils for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Mon May 3 21:36:12 CEST 2010. -------- --- pm-utils/pm-utils.changes 2010-04-07 16:18:18.000000000 +0200 +++ pm-utils/pm-utils.changes 2010-04-30 11:18:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 09:18:15 UTC 2010 - mvyskocil(a)suse.cz + +- fix bnc#304995: export SUSE_IGNORE_FBMODES to ignore fb.modes read from DirectFB + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.Uz5Zp5/_old 2010-05-03 21:35:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Uz5Zp5/_new 2010-05-03 21:35:51.000000000 +0200 @@ -23,7 +23,7 @@ Name: pm-utils Version: 1.3.0 -Release: 2 +Release: 3 Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base @@ -48,6 +48,8 @@ #PATCH-FIX-OPENSUSE: drop import-fdi-quirkdb from installation, SUSE has it included #Note: it will be removed in next release, no needed to ustream Patch7: pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch +#PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995 +Patch8: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch # http://gitorious.org/opensuse/pm-utils-suse Source1: pm-utils-suse-6f9f8b2ab5e0867e70a7d354f715d22d88c8f04b.tar.bz2 Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 @@ -106,6 +108,7 @@ %patch5 -p1 -b .suse-grub %patch6 -p1 -b .suse-logging %patch7 -p1 -b .drop-import-fdi-quirkdb +%patch8 -p1 -b .directfb-ignore-fbmodes %build %{configure} \ ++++++ pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch ++++++ Index: pm-utils-1.3.0/pm/module.d/uswsusp =================================================================== --- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2010-04-30 11:09:07.000000000 +0200 +++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-04-30 11:11:14.817673683 +0200 @@ -132,6 +132,8 @@ HIBERNATE_MODULE="uswsusp" do_hibernate() { + # bnc#304995 workaround + export SUSE_IGNORE_FBMODES="true" get_s2ram_opts if [ -z "${S2DISK_CONF}" ]; then s2disk @@ -148,6 +150,8 @@ SUSPEND_HYBRID_MODULE="uswsusp" do_suspend_hybrid() { + # bnc#304995 workaround + export SUSE_IGNORE_FBMODES="true" get_s2ram_opts if [ -z "${S2DISK_CONF}" ]; then s2both --force $S2RAM_OPTS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-libs-extern for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Mon May 3 21:35:38 CEST 2010. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-23 15:22:06.000000000 +0200 +++ OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-29 20:38:14.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 29 14:29:52 CEST 2010 - pmladek(a)suse.cz + +- added initial support to use the system libmysqlcppconn on openSUSE > 12.1; + the not-yet released version >= 1.0.6 was needed +- linked the internal libmysqlcppconn.so against a particular libmysqlclient.so; + then rpm was able to automatically detect the dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mysqlcppconn-static-mysql-binding.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.Smg4Ws/_old 2010-05-03 21:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Smg4Ws/_new 2010-05-03 21:34:22.000000000 +0200 @@ -22,7 +22,7 @@ # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no Version: 3.2.0.99.3 -Release: 1 +Release: 2 %define ooo_build_version 3.2.0.99.3 %define piece libs-extern #!BuildIgnore: OpenOffice_org @@ -31,7 +31,10 @@ BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: OpenOffice_org-ure-devel = %version # mysql stuff +%if %suse_version <= 1210 +# mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlclient-devel +%endif # mozilla stuff %if %suse_version > 1110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel @@ -75,6 +78,7 @@ %define __find_requires /bin/sh %_sourcedir/ooo-libs-extern-req %name Source100: ooo-libs-extern-prov Source101: ooo-libs-extern-req +Patch1000: mysqlcppconn-static-mysql-binding.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -147,6 +151,9 @@ %endif # mysql stuff cp %{S:90} mysqlcppconn/download +# +mkdir -p ooo-build/hotfixes +cp %{P:1000} ooo-build/hotfixes %build # setup env. ++++++ mysqlcppconn-static-mysql-binding.diff ++++++ --- mysqlcppconn/mysql-connector-cpp.patch.old 2010-03-29 20:51:14.000000000 +0200 +++ mysqlcppconn/mysql-connector-cpp.patch 2010-04-28 17:00:03.000000000 +0200 @@ -321,7 +321,7 @@ @@ -1 +1,2 @@ -dummy +#define HAVE_DLFCN_H 1 -+//#define MYSQLCLIENT_STATIC_BINDING 1 ++#define MYSQLCLIENT_STATIC_BINDING 1 --- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200 +++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:50.534346360 +0200 @@ -1 +1,23 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wavpack for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package wavpack for openSUSE:Factory checked in at Mon May 3 21:34:09 CEST 2010. -------- --- wavpack/wavpack.changes 2008-09-04 13:42:26.000000000 +0200 +++ wavpack/wavpack.changes 2010-04-30 08:57:21.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 08:57:13 CEST 2010 - meissner(a)suse.de + +- buildrequire pkgconfig + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wavpack.spec ++++++ --- /var/tmp/diff_new_pack.JDGVbO/_old 2010-05-03 21:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.JDGVbO/_new 2010-05-03 21:34:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wavpack (Version 4.50.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,18 @@ Name: wavpack -License: BSD 3-Clause +License: BSD3c +BuildRequires: pkgconfig Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://www.wavpack.com/ Summary: Free Hybrid Lossless Audio Compression Format Version: 4.50.1 -Release: 1 +Release: 9 Source: %{name}-%{version}.tar.bz2 # Name used by third parties before openSUSE 10.3: Provides: WavPack = %{version}-%{release} Requires: libwavpack1 >= %{version} -Obsoletes: WavPack +Obsoletes: WavPack < %version BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,7 +62,7 @@ David Bryant <david(a)wavpack.com> %package -n libwavpack1 -License: BSD 3-Clause +License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format Group: System/Libraries @@ -94,7 +95,7 @@ David Bryant <david(a)wavpack.com> %package devel -License: BSD 3-Clause +License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glibc-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 slang for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package slang for openSUSE:Factory checked in at Mon May 3 21:33:52 CEST 2010. -------- --- slang/slang.changes 2010-01-13 13:50:02.000000000 +0100 +++ slang/slang.changes 2010-04-08 13:51:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 8 13:41:31 CEST 2010 - meissner(a)suse.de + +- unbreak occasional build failures by disabling parallel make. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.cEzGgQ/_old 2010-05-03 21:33:26.000000000 +0200 +++ /var/tmp/diff_new_pack.cEzGgQ/_new 2010-05-03 21:33:26.000000000 +0200 @@ -22,7 +22,7 @@ License: Artistic ; GPLv2+ Group: System/Libraries Version: 2.1.1 -Release: 85 +Release: 86 Provides: slang%{version} AutoReqProv: on # bug437293 @@ -83,8 +83,9 @@ --sysconfdir=/etc \ --mandir=%{_mandir} \ --enable-warnings -make %{?_smp_mflags} static -make %{?_smp_mflags} +# Not parallizable in 2.1.1. -Marcus Meissner +make static +make %install rm -rf "$RPM_BUILD_ROOT" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sendmail for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package sendmail for openSUSE:Factory checked in at Mon May 3 21:33:10 CEST 2010. -------- --- sendmail/uucp.changes 2009-12-18 00:42:58.000000000 +0100 +++ sendmail/uucp.changes 2010-03-09 17:03:48.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 9 16:03:15 UTC 2010 - lnussel(a)suse.de + +- use lockdev (FATE#308360) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- uucp-1.07-lockdev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sendmail.spec ++++++ --- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:21.000000000 +0200 +++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:21.000000000 +0200 @@ -37,7 +37,7 @@ Obsoletes: sendmail-tls AutoReqProv: on Version: 8.14.4 -Release: 1 +Release: 2 Summary: BSD Sendmail Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail-%{version}.tar.bz2 Source1: FAQ.sendmail-8.14.bz2 @@ -87,7 +87,7 @@ %package -n rmail Version: 8.14.3 -Release: 51 +Release: 52 Summary: Rmail of the BSD Sendmail License: PERMISSIVE-OSI-COMPLIANT Group: Productivity/Networking/Email/Servers ++++++ uucp.spec ++++++ --- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:21.000000000 +0200 +++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:21.000000000 +0200 @@ -26,7 +26,7 @@ Recommends: stunnel AutoReqProv: on Version: 1.07 -Release: 426 +Release: 427 Summary: Taylor UUCP Source0: uucp-1.07.tar.bz2 Source1: uucpcfg.tar.bz2 @@ -37,7 +37,9 @@ Patch1: uucp-1.07-contrib.dif Patch2: uucp-1.07-grade.patch Patch3: uucp-1.07-cu.patch +Patch4: uucp-1.07-lockdev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: lockdev-devel pkg-config %description Ian Taylor's Unix to Unix copy: mail and news over modem lines. This is @@ -63,6 +65,7 @@ %patch -P 1 -b .cont %patch -P 2 -p0 -b .grad %patch -P 3 -p0 -b .cu +%patch -P 4 -p0 -b .lockdev %patch -P 0 %build @@ -71,9 +74,7 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" # %{?suse_update_config:%{suse_update_config -f}} - aclocal - automake - autoconf + autoreconf CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE" \ ./configure \ --with-newconfigdir=/etc/uucp \ ++++++ uucp-1.07-lockdev.patch ++++++ Index: unix/serial.c =================================================================== --- unix/serial.c.orig +++ unix/serial.c @@ -126,6 +126,10 @@ const char serial_rcsid[] = "$Id: serial #include <sys/termiox.h> #endif +#if HAVE_LOCKDEV +#include <ttylock.h> +#endif + /* Get definitions for both O_NONBLOCK and O_NDELAY. */ #ifndef O_NDELAY #ifdef FNDELAY @@ -623,6 +627,18 @@ fsserial_lockfile (flok, qconn) z = zalc; } #else /* ! HAVE_QNX_LOCKFILES */ +#if HAVE_LOCKDEV + { + int rc; + + if (flok) + rc = ttylock(qsysdep->zdevice); + else + rc = ttyunlock(qsysdep->zdevice); + fret = (rc == 0 ? TRUE : FALSE); + return fret; + } +#else /* ! HAVE_LOCKDEV */ #if ! HAVE_SVR4_LOCKFILES { const char *zbase; @@ -660,6 +676,7 @@ fsserial_lockfile (flok, qconn) z = zalc; } #endif /* HAVE_SVR4_LOCKFILES */ +#endif /* ! HAVE_LOCKDEV */ #endif /* ! HAVE_QNX_LOCKFILES */ } Index: Makefile.am =================================================================== --- Makefile.am.orig +++ Makefile.am @@ -25,7 +25,7 @@ endif AM_CFLAGS = $(WARN_CFLAGS) $(UUDIRFLAGS) -LDADD = unix/libunix.a uuconf/libuuconf.a lib/libuucp.a +LDADD = unix/libunix.a uuconf/libuuconf.a lib/libuucp.a $(LOCKDEV_LIBS) UUHEADERS = uucp.h uudefs.h uuconf.h policy.h system.h sysdep.h getopt.h Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -787,4 +787,6 @@ else AC_SYS_LONG_FILE_NAMES fi dnl +PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev])) +dnl AC_OUTPUT(Makefile uuconf/Makefile lib/Makefile unix/Makefile) ++++++ uucp-1.07.dif ++++++ --- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:22.000000000 +0200 @@ -1,11 +1,11 @@ --- .pkgextract -+++ .pkgextract 2006-06-22 12:58:24.000000000 +0200 ++++ .pkgextract 2006-06-22 10:58:24.000000000 +0000 @@ -0,0 +1,3 @@ +patch -p0 -s --suffix=.cont < ../uucp-1.07-contrib.dif +patch -p0 -s --suffix=.grad < ../uucp-1.07-grade.patch +patch -p0 -s --suffix=.cu < ../uucp-1.07-cu.patch --- Makefile.am -+++ Makefile.am 2007-02-12 15:59:24.000000000 +0100 ++++ Makefile.am 2007-02-12 14:59:24.000000000 +0000 @@ -75,20 +75,24 @@ EXTRA_DIST = uusched.in uuto.in \ dist-hook: @@ -36,7 +36,7 @@ chmod 4555 $(DESTDIR)$(uudirdir)/uudir endif --- README.suse -+++ README.suse 2006-06-22 12:58:24.000000000 +0200 ++++ README.suse 2006-06-22 10:58:24.000000000 +0000 @@ -0,0 +1,9 @@ +If you want to have a public uucp directory, use the "pubdir" command +in the sys file and change the permissions of this directory with: @@ -48,8 +48,8 @@ +uucp.uucp 1777. + --- configure.in -+++ configure.in 2006-06-22 12:58:24.000000000 +0200 -@@ -15,6 +15,13 @@ ++++ configure.in 2006-06-22 10:58:24.000000000 +0000 +@@ -15,6 +15,13 @@ AC_ARG_WITH(user, AC_DEFINE_UNQUOTED(OWNER, "$OWNER", [user ID for programs; normally uucp]) AC_SUBST(OWNER) dnl @@ -63,7 +63,7 @@ AC_ARG_WITH(newconfigdir, [ --with-newconfigdir=DIRNAME new config file directory; default PREFIX/conf/uucp], [NEWCONFIGDIR=${withval}], -@@ -57,10 +64,10 @@ +@@ -57,10 +64,10 @@ dnl Adding it here allows the environmen dnl be cached in config.status and in the Makefiles. AR=${AR-ar} AC_SUBST(AR) @@ -75,7 +75,7 @@ AC_CHECK_LIB(sun, getpwnam) AC_C_CONST AC_MSG_CHECKING([for prototypes]) -@@ -361,8 +368,8 @@ +@@ -361,8 +368,8 @@ dnl getdelim. AC_CHECK_FUNC(getdelim, [AC_CHECK_FUNC(getline, [AC_DEFINE(HAVE_GETLINE, 1, [Define if you have the getline function.])], @@ -86,7 +86,7 @@ dnl dnl Check for the SCO buggy ftime; the code can cope with the bug, dnl though it would prefer not to, so if we're cross-configuring we -@@ -465,52 +472,52 @@ +@@ -465,52 +472,52 @@ fi dnl dnl Figure out which functions we need from lib subdirectory if test $ac_cv_func_bsearch != yes; then @@ -153,7 +153,7 @@ dnl Figure out which functions we need from unix subdirectory if test $ac_cv_func_opendir != yes; then UNIXOBJS="$UNIXOBJS dirent.o" -@@ -715,7 +722,7 @@ +@@ -715,7 +722,7 @@ if test $space = no; then fi dnl See whether we can make an extern declaration @@ -163,7 +163,7 @@ AC_CACHE_VAL(uucp_cv_decl_$1, [AC_TRY_COMPILE([#include <sys/types.h> --- cu.1 -+++ cu.1 2006-06-22 12:58:24.000000000 +0200 ++++ cu.1 2006-06-22 10:58:24.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $ +'\" @@ -173,7 +173,7 @@ .SH NAME cu \- Call up another system --- logrotate -+++ logrotate 2006-06-22 12:58:24.000000000 +0200 ++++ logrotate 2006-06-22 10:58:24.000000000 +0000 @@ -0,0 +1,23 @@ +/var/log/uucp/Log /var/log/uucp/Stats { + compress @@ -199,7 +199,7 @@ + copytruncate +} --- policy.h -+++ policy.h 2006-06-22 12:58:24.000000000 +0200 ++++ policy.h 2006-06-22 10:58:24.000000000 +0000 @@ -22,6 +22,15 @@ The author of the program may be contacted at ian(a)airs.com. */ @@ -262,15 +262,6 @@ /* #define LOCKDIR "/etc/locks" */ /* #define LOCKDIR "/usr/spool/locks" */ /* #define LOCKDIR "/usr/spool/uucp/LCK" */ -@@ -349,7 +360,7 @@ - The format for QNX lock files was made up just for Taylor UUCP. - QNX doesn't come with a version of UUCP. */ - #define HAVE_V2_LOCKFILES 0 --#define HAVE_HDB_LOCKFILES 0 -+#define HAVE_HDB_LOCKFILES 1 - #define HAVE_SCO_LOCKFILES 0 - #define HAVE_SVR4_LOCKFILES 0 - #define HAVE_SEQUENT_LOCKFILES 0 @@ -420,7 +431,7 @@ the executable. Leaving them out will decrease the executable size. Leaving them in will make it easier to determine which @@ -402,7 +393,7 @@ #endif /* HAVE_HDB_LOGGING */ --- uuchk.1 -+++ uuchk.1 2006-06-22 15:33:29.000000000 +0200 ++++ uuchk.1 2006-06-22 13:33:29.000000000 +0000 @@ -0,0 +1,39 @@ +.TH uuchk 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -444,7 +435,7 @@ +.B info uucp 'Invoking uuchk' +.RE --- uucico.8 -+++ uucico.8 2006-06-22 12:58:24.000000000 +0200 ++++ uucico.8 2006-06-22 10:58:24.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $ +'\" @@ -454,8 +445,8 @@ .SH NAME uucico \- UUCP file transfer daemon --- uucico.c -+++ uucico.c 2006-06-22 12:58:24.000000000 +0200 -@@ -981,6 +981,9 @@ ++++ uucico.c 2006-06-22 10:58:24.000000000 +0000 +@@ -981,6 +981,9 @@ fcall (puuconf, zconfig, fuuxqt, qorigsy continue; } @@ -466,7 +457,7 @@ /* Make sure this is a legal time to call. */ --- uuconv.1 -+++ uuconv.1 2006-06-22 16:03:11.000000000 +0200 ++++ uuconv.1 2006-06-22 14:03:11.000000000 +0000 @@ -0,0 +1,74 @@ +.TH uuconv 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -543,7 +534,7 @@ +.B info uucp 'Invoking uuconv' +.RE --- uucp.1 -+++ uucp.1 2006-06-22 12:58:25.000000000 +0200 ++++ uucp.1 2006-06-22 10:58:25.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $ +'\" @@ -553,8 +544,8 @@ .SH NAME uucp \- Unix to Unix copy --- uucp.texi -+++ uucp.texi 2006-06-22 12:58:25.000000000 +0200 -@@ -2289,8 +2289,8 @@ ++++ uucp.texi 2006-06-22 10:58:25.000000000 +0000 +@@ -2289,8 +2289,8 @@ system switch (e.g., @samp{uucico -s uun you what happens. The exact location of the log file depends upon the settings in @file{policy.h} when you compiled the program, and on the use of the @code{logfile} command in the @file{config} file. Typical @@ -565,7 +556,7 @@ If you compiled the code with debugging enabled, you can use debugging mode to get a great deal of information about what sort of data is -@@ -2304,7 +2304,7 @@ +@@ -2304,7 +2304,7 @@ last example. Use @samp{-x all} to turn information. The debugging information is written to a file, normally @@ -574,7 +565,7 @@ @file{policy.h}, and the @file{config} file can override the default with the @code{debugfile} command. The debugging file may contain passwords and some file contents as they are transmitted over the line, -@@ -2314,7 +2314,7 @@ +@@ -2314,7 +2314,7 @@ You can use the @option{-f} switch to fo even if the last call failed recently; using @option{-S} when naming a system has the same effect. Otherwise the status file (in the @file{.Status} subdirectory of the main spool directory, normally @@ -583,7 +574,7 @@ attempts from occurring in rapid succession. On older System V based systems which do not have the @code{setreuid} -@@ -2421,7 +2421,7 @@ +@@ -2421,7 +2421,7 @@ be set to @command{uucico}. Here is a sample @file{/etc/passwd} line to accept calls from a remote system named airs: @example @@ -592,7 +583,7 @@ @end example The details may vary on your system. You must use reasonable user and group ID's. You must use the correct file name for @command{uucico}. -@@ -2827,7 +2827,7 @@ +@@ -2827,7 +2827,7 @@ You should periodically trim the UUCP lo grow without limit. The names of the log files are set in @file{policy.h}, and may be overridden in the configuration file (@pxref{config File}). By default they are are @@ -601,7 +592,7 @@ find the @code{savelog} program in the @file{contrib} directory to be of use. There is a manual page for it in @file{contrib} as well. -@@ -3012,8 +3012,8 @@ +@@ -3012,8 +3012,8 @@ upload files to your system. @example # No files may be transferred to this system unknown receive-request no @@ -612,7 +603,7 @@ # Only files in the public directory may be sent (the default anyhow) unknown remote-send ~ @end example -@@ -3022,26 +3022,26 @@ +@@ -3022,26 +3022,26 @@ unknown remote-send ~ Setting the public directory is convenient for the systems which call in. It permits to request a file by prefixing it with @file{~/}. For example, assuming your system is known as @samp{server}, then to @@ -644,7 +635,7 @@ unknown remote-receive ~/upload @end example -@@ -3611,7 +3611,7 @@ +@@ -3611,7 +3611,7 @@ will be used to get the host name, if po @item spool @var{string} @findex spool @cindex spool directory, setting @@ -653,7 +644,7 @@ Specify the spool directory. The default is from @file{policy.h}. This is where UUCP files are queued. Status files and various sorts of -@@ -3622,7 +3622,7 @@ +@@ -3622,7 +3622,7 @@ it. @findex pubdir in config file @cindex public directory @cindex uucppublic @@ -662,7 +653,7 @@ Specify the public directory. The default is from @file{policy.h}. When a file is named using a leading @kbd{~/}, it is taken from or to -@@ -4839,11 +4839,11 @@ +@@ -4839,11 +4839,11 @@ be sent to the remote system when reques @command{uucp} or @command{uux}). The directories in the list should be separated by whitespace. A @samp{~} may be used for the public directory. On a Unix system, this is typically @@ -676,7 +667,7 @@ @end example Listing a directory allows all files within the directory and all -@@ -4851,12 +4851,12 @@ +@@ -4851,12 +4851,12 @@ subdirectories to be sent. Directories them with an exclamation point. For example: @example @@ -692,7 +683,7 @@ directories is read from left to right, and the last directory to apply takes effect; this means that directories should be listed from top down. The default is the root directory (i.e., any file at all may be -@@ -6035,8 +6035,8 @@ +@@ -6035,8 +6035,8 @@ process still exists, the lock attempt f is deleted and the locking algorithm is retried. Older UUCP packages put the lock files in the main UUCP spool directory, @@ -703,7 +694,7 @@ @file{/etc/locks}. The original UUCP lock file format encodes the process ID as a four byte -@@ -6202,7 +6202,7 @@ +@@ -6202,7 +6202,7 @@ following @file{X.} file: @example U ian test1 F D.test1N003r qux @@ -712,7 +703,7 @@ F D.test1N003s I D.test1N003s C cat - ~ian/bar qux -@@ -6214,7 +6214,7 @@ +@@ -6214,7 +6214,7 @@ the command is executed, the latter file directory under the name @samp{qux}. Note that since the file @file{~ian/bar} is already on the execution system, no action need be taken for it. The standard output will be collected in a file, then @@ -722,7 +713,7 @@ @ifset faq --- uulog.1 -+++ uulog.1 2006-06-22 16:03:34.000000000 +0200 ++++ uulog.1 2006-06-22 14:03:34.000000000 +0000 @@ -0,0 +1,128 @@ +.TH uulog 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -853,7 +844,7 @@ +.RE + --- uuname.1 -+++ uuname.1 2006-06-22 16:03:52.000000000 +0200 ++++ uuname.1 2006-06-22 14:03:52.000000000 +0000 @@ -0,0 +1,72 @@ +.TH uuname 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -928,7 +919,7 @@ +.RE + --- uupick.1 -+++ uupick.1 2006-06-22 16:04:13.000000000 +0200 ++++ uupick.1 2006-06-22 14:04:13.000000000 +0000 @@ -0,0 +1,72 @@ +.TH uupick 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -1003,7 +994,7 @@ +.B info uucp 'Invoking uupick' +.RE --- uusched.8 -+++ uusched.8 2006-06-22 16:02:20.000000000 +0200 ++++ uusched.8 2006-06-22 14:02:20.000000000 +0000 @@ -0,0 +1,25 @@ +.TH uusched 8 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -1031,7 +1022,7 @@ +.B info uucp 'Invoking uusched' +.RE --- uustat.1 -+++ uustat.1 2006-06-22 12:58:25.000000000 +0200 ++++ uustat.1 2006-06-22 10:58:25.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $ +'\" @@ -1041,7 +1032,7 @@ .SH NAME uustat \- UUCP status inquiry and control --- uuto.1 -+++ uuto.1 2006-06-22 16:10:32.000000000 +0200 ++++ uuto.1 2006-06-22 14:10:32.000000000 +0000 @@ -0,0 +1,36 @@ +.TH uuto 1 "Taylor UUCP 1.07" +.\" manual page source format generated by PolyglotMan v3.0.8+X.Org, @@ -1080,7 +1071,7 @@ +.RE + --- uux.1 -+++ uux.1 2006-06-22 12:58:25.000000000 +0200 ++++ uux.1 2006-06-22 10:58:25.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $ +'\" @@ -1090,7 +1081,7 @@ .SH NAME uux \- Remote command execution over UUCP --- uuxqt.8 -+++ uuxqt.8 2006-06-22 12:58:25.000000000 +0200 ++++ uuxqt.8 2006-06-22 10:58:25.000000000 +0000 @@ -1,4 +1,6 @@ -''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $ +'\" @@ -1100,8 +1091,8 @@ .SH NAME uuxqt \- UUCP execution daemon --- unix/lock.c -+++ unix/lock.c 2006-06-22 12:58:25.000000000 +0200 -@@ -429,6 +429,7 @@ ++++ unix/lock.c 2006-06-22 10:58:25.000000000 +0000 +@@ -429,6 +429,7 @@ fsdo_lock (zlock, fspooldir, pferr) zerr = "remove"; break; } @@ -1110,8 +1101,8 @@ continue; } --- unix/portnm.c -+++ unix/portnm.c 2006-06-22 12:58:25.000000000 +0200 -@@ -32,7 +32,7 @@ ++++ unix/portnm.c 2006-06-22 10:58:25.000000000 +0000 +@@ -32,7 +32,7 @@ zsysdep_port_name (ftcp_port) #if HAVE_TCP { @@ -1121,8 +1112,8 @@ clen = sizeof (struct sockaddr); --- unix/serial.c -+++ unix/serial.c 2006-06-22 12:58:25.000000000 +0200 -@@ -36,6 +36,7 @@ ++++ unix/serial.c 2006-06-22 10:58:25.000000000 +0000 +@@ -36,6 +36,7 @@ const char serial_rcsid[] = "$Id: serial #include <errno.h> #include <ctype.h> @@ -1130,7 +1121,7 @@ #if HAVE_SYS_PARAM_H #include <sys/param.h> -@@ -999,6 +1000,45 @@ +@@ -1016,6 +1017,45 @@ static struct sbaud_table #ifdef B4000000 { B4000000, 4000000 }, #endif @@ -1176,7 +1167,7 @@ { B0, 0 } }; -@@ -2540,8 +2580,20 @@ +@@ -2557,8 +2597,20 @@ fsysdep_conn_read (qconn, zbuf, pclen, c else csleepchars = MAX_INPUT - 10; @@ -1198,8 +1189,8 @@ if (isleep > 10) { --- unix/tcp.c -+++ unix/tcp.c 2006-06-22 12:58:25.000000000 +0200 -@@ -395,7 +395,7 @@ ++++ unix/tcp.c 2006-06-22 10:58:25.000000000 +0000 +@@ -395,7 +395,7 @@ ftcp_open (qconn, ibaud, fwait, fuser) while (! FGOT_SIGNAL ()) { sockaddr_storage speer; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fribidi for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package fribidi for openSUSE:Factory checked in at Mon May 3 21:32:05 CEST 2010. -------- --- fribidi/fribidi.changes 2009-12-18 00:44:48.000000000 +0100 +++ fribidi/fribidi.changes 2010-04-30 20:17:22.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 18:14:07 UTC 2010 - coolo(a)novell.com + +- buildrequire pkg-config to fix provides + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fribidi.spec ++++++ --- /var/tmp/diff_new_pack.xYDxlt/_old 2010-05-03 21:31:11.000000000 +0200 +++ /var/tmp/diff_new_pack.xYDxlt/_new 2010-05-03 21:31:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fribidi (Version 0.10.9) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: fribidi Version: 0.10.9 -Release: 58 +Release: 59 Summary: Free Implementation of BiDi Algorithm License: GPLv2+ Group: System/Libraries @@ -35,6 +35,7 @@ Source: fribidi-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkg-config %description This library implements the algorithm as described in the "Unicode @@ -47,12 +48,6 @@ API proposal" by Franck Portaneri, which he wrote as a proposal for adding BiDi support to Mozilla. - - -Authors: --------- - Dov Grobgeld <dov(a)imagic.weizmann.ac.il> - %package devel License: GPLv2+ Summary: Static Libraries and Header Files for FriBiDi @@ -63,12 +58,6 @@ This package provides the static libraries and header files for FriBiDi. - - -Authors: --------- - Dov Grobgeld <dov(a)imagic.weizmann.ac.il> - %prep %setup -q ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 babl for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package babl for openSUSE:Factory checked in at Mon May 3 21:30:55 CEST 2010. -------- --- GNOME/babl/babl.changes 2010-01-16 04:19:49.000000000 +0100 +++ babl/babl.changes 2010-05-03 08:15:45.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 3 06:15:36 UTC 2010 - coolo(a)novell.com + +- buildrequire pkg-config to fix provides + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ babl.spec ++++++ --- /var/tmp/diff_new_pack.iP716B/_old 2010-05-03 21:29:34.000000000 +0200 +++ /var/tmp/diff_new_pack.iP716B/_new 2010-05-03 21:29:34.000000000 +0200 @@ -21,12 +21,13 @@ Name: babl Url: http://gegl.org/babl/ Version: 0.1.2 -Release: 1 +Release: 2 License: LGPLv3+ Group: System/Libraries Summary: Dynamic Pixel Format Translation Library Source: ftp://ftp.gtk.org/pub/babl/0.0/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkg-config %define debug_package_requires libbabl-0_1-0 = %{version}-%{release} # None of these is needed for standard build: #BuildRequires: inkscape ruby w3m ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2 for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon May 3 21:29:16 CEST 2010. -------- --- yast2/yast2.changes 2010-04-19 09:54:07.000000000 +0200 +++ yast2/yast2.changes 2010-04-30 13:44:50.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 30 13:32:22 CEST 2010 - jsuchome(a)suse.cz + +- ag_anyxml: do not die on broken XML (bnc#600928) +- 2.19.13 + +------------------------------------------------------------------- +Thu Apr 29 12:15:50 CEST 2010 - jsrain(a)suse.cz + +- fixed typo (bnc#594384) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.19.12.tar.bz2 New: ---- yast2-2.19.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.ROvp6f/_old 2010-05-03 21:28:37.000000000 +0200 +++ /var/tmp/diff_new_pack.ROvp6f/_new 2010-05-03 21:28:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.19.12) +# spec file for package yast2 (Version 2.19.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.19.12 +Version: 2.19.13 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.19.12.tar.bz2 +Source0: yast2-2.19.13.tar.bz2 Prefix: /usr @@ -128,7 +128,7 @@ installation with YaST2. %prep -%setup -n yast2-2.19.12 +%setup -n yast2-2.19.13 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.19.12.tar.bz2 -> yast2-2.19.13.tar.bz2 ++++++ ++++ 2291 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/yast2-2.19.12/VERSION new/yast2-2.19.13/VERSION --- old/yast2-2.19.12/VERSION 2010-04-19 09:51:50.000000000 +0200 +++ new/yast2-2.19.13/VERSION 2010-04-30 13:32:57.000000000 +0200 @@ -1 +1 @@ -2.19.12 +2.19.13 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/yast2-2.19.12/configure.in new/yast2-2.19.13/configure.in --- old/yast2-2.19.12/configure.in 2010-01-05 16:29:19.000000000 +0100 +++ new/yast2-2.19.13/configure.in 2010-01-18 14:40:47.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.19.1, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.19.5, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.1" +VERSION="2.19.5" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" 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/yast2-2.19.12/library/agents/ag_anyxml new/yast2-2.19.13/library/agents/ag_anyxml --- old/yast2-2.19.12/library/agents/ag_anyxml 2008-12-09 14:29:16.000000000 +0100 +++ new/yast2-2.19.13/library/agents/ag_anyxml 2010-04-29 15:49:42.000000000 +0200 @@ -78,9 +78,14 @@ } my $xml = new XML::Simple (%in_args); - my $root = $xml->XMLin ($file); + my $root = eval { $xml->XMLin ($file) }; undef $xml; + if($@) { + y2error ("error while parsing file $file"); + undef $root; + } + ycp::Return ($root, 1); # pass everything as string (bnc#409491) } elsif ($command eq "Write") { 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/yast2-2.19.12/library/modules/Version.ycp new/yast2-2.19.13/library/modules/Version.ycp --- old/yast2-2.19.12/library/modules/Version.ycp 2010-04-19 09:52:32.000000000 +0200 +++ new/yast2-2.19.13/library/modules/Version.ycp 2010-04-30 13:33:03.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.19.12"; +global string yast2 = "2.19.13"; /* EOF */ } 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/yast2-2.19.12/library/packages/src/PackageLock.ycp new/yast2-2.19.13/library/packages/src/PackageLock.ycp --- old/yast2-2.19.12/library/packages/src/PackageLock.ycp 2009-11-26 08:53:11.000000000 +0100 +++ new/yast2-2.19.13/library/packages/src/PackageLock.ycp 2010-04-30 13:32:19.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Packages manipulation (system) * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: PackageLock.ycp 59764 2009-11-26 07:53:10Z lslezak $ + * $Id: PackageLock.ycp 61908 2010-04-29 10:16:18Z jsrain $ * * This should be used everywhere before Pkg is first used. #160319 */ @@ -87,7 +87,7 @@ { symbol ret = Popup::AnyQuestion3( // TRANSLATORS: a popup headline - _("Accessing the Softwaree Management Failed"), + _("Accessing the Software Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question _("Would you like to retry accessing the software manager, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xli for openSUSE:Factory
by root＠hilbert.suse.de 03 May '10

03 May '10

Hello community, here is the log from the commit of package xli for openSUSE:Factory checked in at Mon May 3 21:28:19 CEST 2010. -------- --- xli/xli.changes 2010-04-04 18:51:55.000000000 +0200 +++ xli/xli.changes 2010-05-01 11:09:06.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 1 09:08:08 UTC 2010 - prusnak(a)suse.cz + +- provide also xloadimage +- cleanup specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xli.spec ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -18,14 +18,10 @@ Name: xli -BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel -%define ver 2005-09-04 License: MIT Group: System/X11/Utilities -Provides: xli115 -AutoReqProv: on Version: 20061110 -Release: 126 +Release: 127 Summary: X11 Image Loading Utility Url: http://pantransit.reptiles.org/prog Source: xli-2006-11-10.tar.bz2 @@ -35,33 +31,9 @@ Patch3: xli-1.17.0-configfile.patch Patch4: xli-png_check_sig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if "%(xft-config --prefix)" == "/usr" -%define _xorg7libs %_lib -%define _xorg7libs32 lib -%define _xorg7bin bin -%define _xorg7_mandir %_mandir -%define _xorg7pixmaps include -%define _xorg7libshare share -%define _xorg7_xkb /usr/share/X11/xkb -%define _xorg7_termcap /usr/lib/X11/etc -%define _xorg7_serverincl /usr/include/xorg -%define _xorg7_fonts /usr/share/fonts -#%define _xorg7_config /usr/share/X11/config #use libshare macro -%define _xorg7_prefix /usr -%else -%define _xorg7libs X11R6/%_lib -%define _xorg7libs32 X11R6/lib -%define _xorg7bin X11R6/bin -%define _xorg7_mandir /usr/X11R6/man -%define _xorg7pixmaps X11R6/include -%define _xorg7libshare X11R6/lib/ -%define _xorg7_xkb /etc/X11/xkb -%define _xorg7_termcap /usr/X11R6/lib/X11/etc -%define _xorg7_serverincl /usr/X11R6/lib/Server/include -%define _xorg7_fonts /usr/X11R6/lib/X11/fonts -#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro -%define _xorg7_prefix /usr/X11R6 -%endif +BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel +Provides: xli115 +Provides: xloadimage = %{version} %description xli is a version of xloadimage. @@ -69,13 +41,6 @@ This utility will view several types of images under X11, or load images onto the X11 root window. - - -Authors: --------- - Graeme Gill <GraemeGill(a)access.net.au> - Smarasderagd <smar(a)reptiles.org> - %prep %setup -q -n xli-2006-11-10 %patch0 @@ -86,12 +51,14 @@ %build xmkmf -a -make %{?jobs:-j%jobs} all CCOPTIONS="$RPM_OPT_FLAGS -fstack-protector" +make %{?_smp_mflags} all CCOPTIONS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/usr/lib/X11 -make BINDIR=$RPM_BUILD_ROOT/usr/%{_xorg7bin} install +make BINDIR=$RPM_BUILD_ROOT%{_bindir} install make DESTDIR=$RPM_BUILD_ROOT install.man +ln -s xli $RPM_BUILD_ROOT%{_bindir}/xloadimage +ln -s xli.1x.gz $RPM_BUILD_ROOT%{_mandir}/man1/xloadimage.1x.gz %clean rm -rf $RPM_BUILD_ROOT @@ -99,12 +66,14 @@ %files %defattr(-,root,root) %doc README* ABOUTGAMMA -%doc %{_xorg7_mandir}/man1/xli.1x.gz -%doc %{_xorg7_mandir}/man1/xlito.1x.gz -/usr/%{_xorg7bin}/xli -/usr/%{_xorg7bin}/xlito -/usr/%{_xorg7bin}/xsetbg -/usr/%{_xorg7bin}/xview +%doc %{_mandir}/man1/xli.1x.gz +%doc %{_mandir}/man1/xlito.1x.gz +%doc %{_mandir}/man1/xloadimage.1x.gz +%{_bindir}/xli +%{_bindir}/xlito +%{_bindir}/xloadimage +%{_bindir}/xsetbg +%{_bindir}/xview /usr/lib/X11/Xli %changelog ++++++ xli-1.17.0-8bit_palette.patch ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -1,4 +1,6 @@ ---- pcx.c +Index: pcx.c +=================================================================== +--- pcx.c.orig +++ pcx.c @@ -5,6 +5,8 @@ ** Adapted from code by Jef Poskanzer (see Copyright below). @@ -20,7 +22,7 @@ /* -@@ -129,35 +133,43 @@ +@@ -129,35 +133,43 @@ Image *pcxLoad (char *fullname, ImageOpt xmax = xmax - xmin + 1; ymax = ymax - ymin + 1; in_bpr = pcxhd[66] + ( 256 * pcxhd[67] ); @@ -73,7 +75,7 @@ read_trail_opt(image_ops,zf,image,verbose); zclose(zf); -@@ -173,7 +185,8 @@ +@@ -173,7 +185,8 @@ Image *pcxLoad (char *fullname, ImageOpt ** Returns FALSE if there was a short read. */ @@ -83,7 +85,7 @@ { /* Goes like this: Read a byte. If the two high bits are set, ** then the low 6 bits contain a repeat count, and the byte to -@@ -185,10 +198,12 @@ +@@ -185,10 +198,12 @@ static boolean PCX_LoadImage (ZFILE *zf, int row = 0; int bytes_this_row = 0; int b, i, cnt; @@ -97,7 +99,7 @@ if ((b & 0xC0) == 0xC0) { /* have a repetition count -- mask flag bits */ -@@ -201,12 +216,14 @@ +@@ -201,12 +216,14 @@ static boolean PCX_LoadImage (ZFILE *zf, cnt = 1; /* no repeating this one */ } @@ -114,7 +116,7 @@ if (++bytes_this_row == in_bpr) { /* start of a new line */ row++; -@@ -214,6 +231,25 @@ +@@ -214,6 +231,25 @@ static boolean PCX_LoadImage (ZFILE *zf, } } } ++++++ xli-1.17.0-configfile.patch ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -1,6 +1,8 @@ ---- Imakefile +Index: Imakefile +=================================================================== +--- Imakefile.orig +++ Imakefile -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ JPEG_LDFLAGS = PNG_INCLUDES = PNG_LDFLAGS = ++++++ xli-1.17.0-overflow.patch ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -1,4 +1,6 @@ ---- ddxli.h +Index: ddxli.h +=================================================================== +--- ddxli.h.orig +++ ddxli.h @@ -36,11 +36,13 @@ @@ -14,9 +16,11 @@ #endif #ifndef bfill #define bfill(P,N,C) memset((P),(C),(N)) ---- faces.c +Index: faces.c +=================================================================== +--- faces.c.orig +++ faces.c -@@ -56,9 +56,15 @@ +@@ -56,9 +56,15 @@ isFaces(ZFILE *zf, char *name, char *fna if (! strcmp(buf, "\n")) break; if (!strncmp(buf, "FirstName:", 10)) @@ -34,9 +38,11 @@ else if (!strncmp(buf, "Image:", 6)) { if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) { fprintf(stderr,"facesLoad: %s - Bad image\n", name); ---- reduce.c +Index: reduce.c +=================================================================== +--- reduce.c.orig +++ reduce.c -@@ -178,7 +178,8 @@ +@@ -178,7 +178,8 @@ Image *reduce(Image *image, unsigned col /* get destination image */ depth = colorsToDepth(OutColors); new_image = newRGBImage(image->width, image->height, depth); @@ -46,9 +52,11 @@ new_image->title = dupString(buf); new_image->gamma = image->gamma; ---- zoom.c +Index: zoom.c +=================================================================== +--- zoom.c.orig +++ zoom.c -@@ -52,28 +52,29 @@ +@@ -52,28 +52,29 @@ Image *zoom(Image *oimage, unsigned int if (verbose) printf(" Zooming image Y axis by %d%%...", yzoom); if (changetitle) ++++++ xli-1.17.0.patch ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -1,5 +1,7 @@ ---- ddxli.h 1999-10-25 04:14:53.000000000 +0200 -+++ ddxli.h 2005-09-08 12:07:33.948259924 +0200 +Index: ddxli.h +=================================================================== +--- ddxli.h.orig ++++ ddxli.h @@ -14,7 +14,7 @@ #include <sys/shm.h> #include <X11/extensions/XShm.h> @@ -9,8 +11,10 @@ #include <string.h> #ifndef index /* some SysV's do this for you */ #define index strchr ---- Imakefile 2005-09-05 07:01:30.000000000 +0200 -+++ Imakefile 2005-09-08 12:07:33.931258518 +0200 +Index: Imakefile +=================================================================== +--- Imakefile.orig ++++ Imakefile @@ -9,7 +9,7 @@ # -DHAVE_BOOLEAN if your system declares 'boolean' somewhere # -DHAVE_BUNZIP2 if you have bzip2 and want to handle .bz2 files @@ -20,7 +24,7 @@ CCOPTIONS = -Aa -D_HPUX_SOURCE #endif -@@ -38,8 +38,8 @@ +@@ -38,8 +38,8 @@ ComplexProgramTarget_2(xlito,,) install:: $(SYSPATHFILE) $(RM) $(BINDIR)/xview $(BINDIR)/xsetbg @@ -31,9 +35,11 @@ $(SYSPATHFILE): @echo "*** Creating default $(SYSPATHFILE) since you" ---- root.c 2005-09-05 07:01:30.000000000 +0200 -+++ root.c 2005-09-08 12:07:34.013265302 +0200 -@@ -55,8 +55,8 @@ +Index: root.c +=================================================================== +--- root.c.orig ++++ root.c +@@ -55,8 +55,8 @@ static void freePrevious(Display * dpy, Pixmap *pm; Atom actual_type; /* NOTUSED */ int format; @@ -44,7 +50,7 @@ /* intern the property name */ Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0); -@@ -64,8 +64,7 @@ +@@ -64,8 +64,7 @@ static void freePrevious(Display * dpy, /* look for existing resource allocation */ if ((XGetWindowProperty(dpy, w, atom, 0, 1, 1 /*delete */ , AnyPropertyType, &actual_type, &format, @@ -54,7 +60,7 @@ (unsigned char **) &pm) == Success) && nitems == 1) { if ((actual_type == XA_PIXMAP) && (format == 32) && -@@ -162,14 +161,13 @@ +@@ -162,14 +161,13 @@ void imageOnRoot(DisplayInfo * dinfo, Im for (i = 0; i < numChildren; i++) { Atom actual_type; int actual_format; ++++++ xli-png_check_sig.patch ++++++ --- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200 @@ -1,4 +1,6 @@ ---- png.c +Index: png.c +=================================================================== +--- png.c.orig +++ png.c @@ -11,7 +11,7 @@ @@ -9,7 +11,7 @@ static int check_png(char *file_name) { ZFILE *zfp; -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ static int check_png(char *file_name) if (ret != 8) return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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