August 2011 - openSUSE Commits - openSUSE Mailing Lists

commit python-cups for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package python-cups for openSUSE:Factory checked in at Mon Aug 1 10:17:20 CEST 2011. -------- --- python-cups/python-cups.changes 2011-06-09 16:39:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-cups/python-cups.changes 2011-07-30 09:57:55.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 30 09:57:14 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 1.9.58: + + Add cups.Connection.adminExportSamba. + + Build fixes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pycups-1.9.57.tar.bz2 New: ---- pycups-1.9.58.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cups.spec ++++++ --- /var/tmp/diff_new_pack.zxEGwR/_old 2011-08-01 10:16:09.000000000 +0200 +++ /var/tmp/diff_new_pack.zxEGwR/_new 2011-08-01 10:16:09.000000000 +0200 @@ -21,13 +21,13 @@ Name: python-cups %define _name pycups BuildRequires: cups-devel python-devel -Version: 1.9.57 +Version: 1.9.58 Release: 1 Group: Development/Libraries/Python License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://cyberelk.net/tim/software/pycups/ -Source: %{_name}-%{version}.tar.bz2 +Source: http://cyberelk.net/tim/data/pycups/%{_name}-%{version}.tar.bz2 Summary: Python Bindings for CUPS %py_requires ++++++ pycups-1.9.57.tar.bz2 -> pycups-1.9.58.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/ChangeLog new/pycups-1.9.58/ChangeLog --- old/pycups-1.9.57/ChangeLog 2011-06-09 14:25:49.000000000 +0200 +++ new/pycups-1.9.58/ChangeLog 2011-07-26 13:20:12.000000000 +0200 @@ -1,3 +1,30 @@ +2011-07-26 Tim Waugh <twaugh(a)redhat.com> + + * setup.py: Version 1.9.58. + +2011-07-25 Tim Waugh <twaugh(a)redhat.com> + + * MANIFEST.in: New file. + * Makefile: Use sdist for creating tarballs. + + * setup.py: Added more information ready for PyPI. + +2011-07-18 Tim Waugh <twaugh(a)redhat.com> + + * cupsconnection.c: Applied patch from Gowtham Narisipalli to + add adminExportSamba method. + +2011-06-27 Tim Waugh <twaugh(a)redhat.com> + + * setup.py: Link against libiconv on darwin (trac #15). + + * cupsppd.c: Fixed feature test for getline() (trac #15). + +2011-06-16 Tim Waugh <twaugh(a)redhat.com> + + * postscriptdriver.prov: Increase timeout for dynamic driver + listing. + 2011-06-09 Tim Waugh <twaugh(a)redhat.com> * setup.py: Version 1.9.57. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/Makefile new/pycups-1.9.58/Makefile --- old/pycups-1.9.57/Makefile 2011-02-23 12:18:53.000000000 +0100 +++ new/pycups-1.9.58/Makefile 2011-07-26 13:28:36.000000000 +0200 @@ -1,5 +1,6 @@ NAME=pycups VERSION:=$(shell python setup.py --version) +SDIST_ARGS=--formats=bztar -d. RPMCONFIGDIR:=$(shell rpm -E "%{_rpmconfigdir}" 2>/dev/null || :) SOURCES=cupsmodule.c cupsconnection.c cupsppd.c cupsipp.c setup.py \ @@ -10,23 +11,25 @@ examples \ COPYING NEWS README TODO ChangeLog -cups.so: $(SOURCES) +cups.so: force python setup.py build - ln -sf build/lib*/$@ . + mv build/lib*/$@ . doc: cups.so rm -rf html epydoc -o html --html $< +doczip: doc + cd html && zip ../cups-html.zip * + clean: -rm -rf build cups.so *.pyc *~ dist: - rm -rf $(NAME)-$(VERSION) - mkdir $(NAME)-$(VERSION) - cp -a $(SOURCES) $(DIST) $(NAME)-$(VERSION) - tar jcf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) - rm -rf $(NAME)-$(VERSION) + python setup.py sdist $(SDIST_ARGS) + +upload: + python setup.py sdist $(SDIST_ARGS) upload -s install: install-rpmhook ROOT= ; \ @@ -41,5 +44,4 @@ install -m0755 postscriptdriver.prov "$$RPMCONFIG"/ ; \ fi -.PHONY: doc clean dist install install-rpmhook - +.PHONY: doc doczip clean dist install install-rpmhook force diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/NEWS new/pycups-1.9.58/NEWS --- old/pycups-1.9.57/NEWS 2011-06-09 14:26:38.000000000 +0200 +++ new/pycups-1.9.58/NEWS 2011-07-19 10:42:45.000000000 +0200 @@ -1,6 +1,10 @@ NEWS ---- +New in 1.9.58: + +* cups.Connection.adminExportSamba + New in 1.9.57: * Fixed rpm provides script for newer versions of rpm. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/PKG-INFO new/pycups-1.9.58/PKG-INFO --- old/pycups-1.9.57/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/pycups-1.9.58/PKG-INFO 2011-07-26 13:29:19.000000000 +0200 @@ -0,0 +1,31 @@ +Metadata-Version: 1.0 +Name: pycups +Version: 1.9.58 +Summary: Python bindings for libcups +Home-page: http://cyberelk.net/tim/software/pycups/ +Author: Tim Waugh +Author-email: twaugh(a)redhat.com +License: GPLv2+ +Download-URL: http://cyberelk.net/tim/data/pycups/ +Description: This is a set of Python bindings for the libcups library from the + CUPS project. + + >>> # Example of getting a list of printers + >>> import cups + >>> conn = cups.Connection () + >>> printers = conn.getPrinters () + >>> for printer in printers: + ... print printer, printers[printer]["device-uri"] + ... + HP ipp://192.168.1.1:631/printers/HP + duplex ipp://192.168.1.1:631/printers/duplex + HP-LaserJet-6MP ipp://192.168.1.1:631/printers/HP-LaserJet-6MP + EPSON-Stylus-D78 usb://EPSON/Stylus%20D78 + +Platform: UNKNOWN +Classifier: Intended Audience :: Developers +Classifier: Topic :: Software Development :: Libraries :: Python Modules +Classifier: License :: OSI Approved :: GNU General Public License (GPL) +Classifier: Development Status :: 5 - Production/Stable +Classifier: Operating System :: Unix +Classifier: Programming Language :: C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/cupsconnection.c new/pycups-1.9.58/cupsconnection.c --- old/pycups-1.9.57/cupsconnection.c 2011-05-24 12:22:04.000000000 +0200 +++ new/pycups-1.9.58/cupsconnection.c 2011-07-19 10:42:10.000000000 +0200 @@ -3749,6 +3749,77 @@ } static PyObject * +Connection_adminExportSamba (Connection *self, PyObject *args) +{ + int ret; + PyObject *nameobj; + char *name; + PyObject *serverobj; + char *server; + PyObject *userobj; + char *user; + PyObject *passwordobj; + char *password; + char ppdfile[1024]; + FILE *tmpfile(void); + FILE *tf; + char str[80]; + + if (!PyArg_ParseTuple (args, "OOOO", &nameobj, &serverobj, &userobj, + &passwordobj)) + return NULL; + + if (UTF8_from_PyObj (&name, nameobj) == NULL || + UTF8_from_PyObj (&server, serverobj) == NULL || + UTF8_from_PyObj (&user, userobj) == NULL || + UTF8_from_PyObj (&password, passwordobj) == NULL) { + free (name); + free (server); + free (user); + free (password); + PyErr_SetString(PyExc_RuntimeError, + "name, samba_server, samba_username, samba_password " + "must be specified"); + return NULL; + } + + if (!cupsAdminCreateWindowsPPD(self->http, name, ppdfile, sizeof(ppdfile))) { + PyErr_SetString(PyExc_RuntimeError, + "No PPD file found for the printer"); + return NULL; + } + + debugprintf ("-> Connection_adminExportSamba()\n"); + tf = tmpfile(); + Connection_begin_allow_threads (self); + ret = cupsAdminExportSamba(name, ppdfile, server, user, password, tf); + Connection_end_allow_threads (self); + + free (name); + free (server); + free (user); + free (password); + unlink (ppdfile); + + if (!ret) { + rewind(tf); + // Read logfile line by line to get Exit status message on the last line. + while (fgets (str, sizeof(str), tf) != NULL) { } + fclose (tf); + if (str[strlen(str) -1] == '\n') { + str[strlen(str) -1] = '\0'; + } + PyErr_SetString (PyExc_RuntimeError, str); + debugprintf ("<- Connection_adminExportSamba() EXCEPTION\n"); + return NULL; + } + fclose (tf); + Py_INCREF (Py_None); + debugprintf ("<- Connection_adminExportSamba()\n"); + return Py_None; +} + +static PyObject * Connection_adminGetServerSettings (Connection *self) { PyObject *ret = PyDict_New (); @@ -5032,6 +5103,21 @@ "@keyword user: user to submit the job as\n" "@raise IPPError: IPP problem" }, + { "adminExportSamba", + (PyCFunction) Connection_adminExportSamba, METH_VARARGS, + "adminExportSamba(name, samba_server, samba_username,\n" + " samba_password) -> None\n\n" + "Export a printer to Samba.\n\n" + "@type name: string\n" + "@param name: queue name\n" + "@type samba_server: string\n" + "@param samba_server: samba server\n" + "@type samba_username: string\n" + "@param samba_username: samba username\n" + "@type samba_password: string\n" + "@param samba_password: samba password\n" + "@raise IPPError: IPP problem" }, + { "adminGetServerSettings", (PyCFunction) Connection_adminGetServerSettings, METH_NOARGS, "adminGetServerSettings() -> dict\n\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/cupsppd.c new/pycups-1.9.58/cupsppd.c --- old/pycups-1.9.57/cupsppd.c 2011-05-23 12:25:31.000000000 +0200 +++ new/pycups-1.9.58/cupsppd.c 2011-06-27 11:16:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * cups - Python bindings for CUPS - * Copyright (C) 2002, 2005, 2006, 2007, 2008 Tim Waugh <twaugh(a)redhat.com> + * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2011 Tim Waugh <twaugh(a)redhat.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -507,7 +507,7 @@ return PyBool_FromLong (nondefaults_marked); } -#ifdef __SVR4 +#if !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700) /* * A rudimentary emulation of getline() for systems that dont support it * natively. Since this is used for PPD file reading, it assumes (possibly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/postscriptdriver.prov new/pycups-1.9.58/postscriptdriver.prov --- old/pycups-1.9.57/postscriptdriver.prov 2011-06-09 14:03:11.000000000 +0200 +++ new/pycups-1.9.58/postscriptdriver.prov 2011-06-16 16:24:01.000000000 +0200 @@ -142,7 +142,7 @@ raise TimedOut def list (self): - signal.alarm (60) + signal.alarm (180) env = os.environ.copy () if RPM_BUILD_ROOT: buildroot = RPM_BUILD_ROOT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.57/setup.py new/pycups-1.9.58/setup.py --- old/pycups-1.9.57/setup.py 2011-06-09 14:25:25.000000000 +0200 +++ new/pycups-1.9.58/setup.py 2011-07-26 13:23:35.000000000 +0200 @@ -1,9 +1,65 @@ +#!/usr/bin/python + +## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc +## Author: Tim Waugh <twaugh(a)redhat.com> + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +"""This is a set of Python bindings for the libcups library from the +CUPS project. + +>>> # Example of getting a list of printers +>>> import cups +>>> conn = cups.Connection () +>>> printers = conn.getPrinters () +>>> for printer in printers: +... print printer, printers[printer]["device-uri"] +... +HP ipp://192.168.1.1:631/printers/HP +duplex ipp://192.168.1.1:631/printers/duplex +HP-LaserJet-6MP ipp://192.168.1.1:631/printers/HP-LaserJet-6MP +EPSON-Stylus-D78 usb://EPSON/Stylus%20D78 +""" + from distutils.core import setup, Extension -VERSION="1.9.57" +import sys +VERSION="1.9.58" +libraries=["cups"] + +if sys.platform == "darwin": + libraries.append ("iconv") + setup (name="pycups", version=VERSION, + description="Python bindings for libcups", + long_description=__doc__, + maintainer="Tim Waugh", + maintainer_email="twaugh(a)redhat.com", + url="http://cyberelk.net/tim/software/pycups/", + download_url="http://cyberelk.net/tim/data/pycups/", + classifiers=[ + "Intended Audience :: Developers", + "Topic :: Software Development :: Libraries :: Python Modules", + "License :: OSI Approved :: GNU General Public License (GPL)", + "Development Status :: 5 - Production/Stable", + "Operating System :: Unix", + "Programming Language :: C", + ], + license="GPLv2+", ext_modules=[Extension("cups", ["cupsmodule.c", "cupsconnection.c", "cupsppd.c", "cupsipp.c"], - libraries=["cups"], + libraries=libraries, define_macros=[("VERSION", '"%s"' % VERSION)])]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bridge-utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package bridge-utils for openSUSE:Factory checked in at Mon Aug 1 10:15:44 CEST 2011. -------- --- bridge-utils/bridge-utils.changes 2009-12-20 14:07:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/bridge-utils/bridge-utils.changes 2011-07-26 16:30:05.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jul 25 14:16:57 CST 2011 - lidongyang(a)novell.com +- bnc#707837 - network:utilities/bridge-utils: Bug in Factory 12.1 + brctl has changed from /sbin to /usr/sbin + revert the changes made to %install section of the spec file + +------------------------------------------------------------------- +Wed Jun 8 14:22:43 CST 2011 - lidongyang(a)novell.com + +- update to 1.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bridge-utils-1.4-hz.diff bridge-utils-1.4-optflags.patch bridge-utils-1.4.tar.bz2 New: ---- bridge-utils-1.5-hz.diff bridge-utils-1.5-optflags.patch bridge-utils-1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bridge-utils.spec ++++++ --- /var/tmp/diff_new_pack.WeB1PU/_old 2011-08-01 10:04:41.000000000 +0200 +++ /var/tmp/diff_new_pack.WeB1PU/_new 2011-08-01 10:04:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bridge-utils (Version 1.4) +# spec file for package bridge-utils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,16 +20,16 @@ Name: bridge-utils BuildRequires: libsysfs -Version: 1.4 -Release: 55 +Version: 1.5 +Release: 1 AutoReqProv: on Group: Productivity/Networking/Routing License: GPLv2+ Url: http://www.linux-foundation.org/en/Net:Bridge Summary: Utilities for Configuring the Linux Ethernet Bridge -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz Patch: %{name}-%{version}-hz.diff -Patch1: bridge-utils-1.4-optflags.patch +Patch1: %{name}-%{version}-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,8 +59,10 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -install -d -m755 $RPM_BUILD_ROOT/sbin +install -d -m 755 $RPM_BUILD_ROOT/sbin mv $RPM_BUILD_ROOT%{_sbindir}/brctl $RPM_BUILD_ROOT/sbin +install -D -m 644 libbridge/libbridge.h %{buildroot}%{_includedir}/libbridge.h +install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a %clean rm -rf $RPM_BUILD_ROOT ++++++ bridge-utils-1.4-hz.diff -> bridge-utils-1.5-hz.diff ++++++ ++++++ bridge-utils-1.4-optflags.patch -> bridge-utils-1.5-optflags.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Mon Aug 1 10:03:20 CEST 2011. -------- --- mkinitrd/mkinitrd.changes 2011-07-20 11:03:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-07-29 16:04:36.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 13:46:54 UTC 2011 - mmarek(a)suse.cz + +- Add the dmesg utility for easier debugging. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.bzZcsB/_old 2011-08-01 10:02:13.000000000 +0200 +++ /var/tmp/diff_new_pack.bzZcsB/_new 2011-08-01 10:02:13.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.7.0 -Release: 21 +Release: 23 Conflicts: udev < 118 Requires: dhcpcd PreReq: %fillup_prereq ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-07-20 11:01:50.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-07-29 15:47:20.000000000 +0200 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 13:46:54 UTC 2011 - mmarek(a)suse.cz + +- Add the dmesg utility for easier debugging. + +------------------------------------------------------------------- Wed Jul 20 08:32:49 UTC 2011 - mmarek(a)novell.com - Fix typo in boot-mount.sh (bnc#704867#c6). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-start.sh new/mkinitrd-2.7.0/scripts/boot-start.sh --- old/mkinitrd-2.7.0/scripts/boot-start.sh 2011-07-20 11:01:50.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-start.sh 2011-07-29 15:47:20.000000000 +0200 @@ -2,7 +2,7 @@ # #%stage: boot #%depends: devfunctions -#%programs: /bin/bash umount mount mknod mkdir ln date sleep cat /bin/sed /sbin/insmod /sbin/modprobe kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* +#%programs: /bin/bash umount mount mknod mkdir ln date sleep cat /bin/sed /sbin/insmod /sbin/modprobe kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* dmesg #%modules: $RESOLVED_INITRD_MODULES #%udevmodules: $RESOLVED_INITRD_MODULES_UDEV #%dontshow ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gpgme for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package gpgme for openSUSE:Factory checked in at Mon Aug 1 10:01:16 CEST 2011. -------- --- gpgme/gpgme.changes 2011-04-28 08:30:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/gpgme/gpgme.changes 2011-07-29 17:54:23.000000000 +0200 @@ -0,0 +1,13 @@ +Fri Jul 29 15:31:36 UTC 2011 - puzel(a)novell.com + +- update to gpgme-1.3.1 + - Detect GPG versions not supporting ---passwd. + - Interface changes relative to the 1.3.0 release: + GPGME_EXPORT_MODE_MINIMAL NEW + GPGME_STATUS_SUCCESS NEW + gpgme_err_code_from_syserror NEW + gpgme_err_set_errno NEW + gpgme_error_from_errno CHANGED: Return gpgme_error_t + gpgme_error_from_syserror NEW +- drop gnupg-2.0.17-test-failure.patch (fixed upstream) + @@ -17,0 +31 @@ +>>>>>>> ./gpgme.changes.r4f20f9a7e442573486c918b107fed59f calling whatdependson for head-i586 Old: ---- gnupg-2.0.17-test-failure.patch gpgme-1.3.0.tar.bz2 New: ---- gpgme-1.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpgme.spec ++++++ --- /var/tmp/diff_new_pack.Fi1rX5/_old 2011-08-01 09:56:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Fi1rX5/_new 2011-08-01 09:56:42.000000000 +0200 @@ -24,18 +24,16 @@ %else BuildRequires: pth >= 2.0.7 %endif -Version: 1.3.0 -Release: 15 +Version: 1.3.1 +Release: 1 License: GPLv2+ Summary: A Library Designed to Give Applications Easy Access to GnuPG Url: http://www.gnupg.org/related_software/gpgme/ Group: Productivity/Security Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 -Source2: baselibs.conf Patch0: gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch -# PATCH-FIX-UPSTREAM gnupg-2.0.17-test-failure.patch idoenmez(a)suse.de -- Fix test failure with gnupg 2.0.17 -Patch1: gnupg-2.0.17-test-failure.patch -BuildRequires: libassuan-devel >= 1.1.0 +Source2: baselibs.conf +BuildRequires: libassuan-devel >= 2.0.2 BuildRequires: libgpg-error-devel >= 1.4 PreReq: %install_info_prereq Requires: gpg2 @@ -105,7 +103,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build sh autogen.sh ++++++ gpgme-1.3.0.tar.bz2 -> gpgme-1.3.1.tar.bz2 ++++++ ++++ 18172 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 libassuan for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package libassuan for openSUSE:Factory checked in at Mon Aug 1 09:56:14 CEST 2011. -------- --- libassuan/libassuan.changes 2010-10-31 19:03:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/libassuan/libassuan.changes 2011-07-29 17:28:06.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Jul 29 15:26:04 UTC 2011 - puzel(a)novell.com + +- update to libassuan-2.0.2 + - A new flag may now be used to convey comments via + assuan_transact. + - A new flag value may now be used to disable logging. + - The gpgcedev.c driver now provides a log device. + - It is now possible to overwrite socket and connect functions in + struct assuan_system_hooks. + - Interface changes relative to the 2.0.1 release: + ASSUAN_CONVEY_COMMENTS NEW. + ASSUAN_NO_LOGGING NEW. + assuan_system_hooks_t CHANGED: Added socket and connect members. + ASSUAN_SYSTEM_HOOKS_VERSION CHANGED: Bumped to 2. + assuan_register_pre_cmd_notify NEW. +- use spec-cleaner + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libassuan-2.0.1.tar.bz2 New: ---- libassuan-2.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libassuan.spec ++++++ --- /var/tmp/diff_new_pack.yc94QV/_old 2011-08-01 09:53:22.000000000 +0200 +++ /var/tmp/diff_new_pack.yc94QV/_new 2011-08-01 09:53:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libassuan (Version 2.0.1) +# spec file for package libassuan # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libassuan -Summary: IPC library used by GnuPG version 2 -Version: 2.0.1 -Release: 2 +Version: 2.0.2 +Release: 1 License: GPLv2+ ; LGPLv2.1+ -Group: Development/Libraries/C and C++ +Summary: IPC library used by GnuPG version 2 Url: http://www.gnupg.org/aegypten2/index.html +Group: Development/Libraries/C and C++ Source: libassuan-%{version}.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,27 +38,14 @@ %description Libassuan is the IPC library used by gpg2 (GnuPG version 2) -Authors: --------- - Werner Koch <wk(a)gnupg.org> - Neal H. Walfield <neal(a)g10code.de> - Marcus Brinkmann <marcus(a)g10code.de> - %package -n libassuan0 -Summary: IPC library used by GnuPG version 2 License: GPLv2+ ; LGPLv2.1+ +Summary: IPC library used by GnuPG version 2 Group: Development/Libraries/C and C++ %description -n libassuan0 Libassuan is the IPC library used by gpg2 (GnuPG version 2) -Authors: --------- - Werner Koch <wk(a)gnupg.org> - Neal H. Walfield <neal(a)g10code.de> - Marcus Brinkmann <marcus(a)g10code.de> - - %package devel License: GPLv2+ ; LGPLv2.1+ Summary: IPC library used by GnuPG version 2 @@ -78,32 +64,23 @@ gpgme also uses libassuan to communicate with a libassuan-enabled GnuPG v2 server, but it uses it's own copy of libassuan. - -Authors: --------- - Werner Koch <wk(a)g10code.com> - Neal H. Walfield <neal(a)g10code.de> - Marcus Brinkmann <marcus(a)g10code.de> - %prep %setup -q %build # Compile with PIC, library is linked into shared libraries: -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" export LDFLAGS="-fPIC" %configure make %{?_smp_mflags} %install -%makeinstall +%make_install rm -f %{buildroot}%{_libdir}/*.la -%post -n libassuan0 -/sbin/ldconfig +%post -n libassuan0 -p /sbin/ldconfig -%postun -n libassuan0 -/sbin/ldconfig +%postun -n libassuan0 -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/assuan.info.gz ++++++ libassuan-2.0.1.tar.bz2 -> libassuan-2.0.2.tar.bz2 ++++++ ++++ 10545 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 libksba for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package libksba for openSUSE:Factory checked in at Mon Aug 1 09:52:51 CEST 2011. -------- --- libksba/libksba.changes 2010-12-03 13:01:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/libksba/libksba.changes 2011-07-29 18:02:16.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 29 15:58:31 UTC 2011 - puzel(a)novell.com + +- update to libksba-1.2.0 + - New functions to allow the creation of X.509 certificates. + - Interface changes relative to the 1.1.0 release: + ksba_certreq_set_serial NEW + ksba_certreq_set_issuer NEW + ksba_certreq_set_validity NEW + ksba_certreq_set_siginfo NEW + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libksba-1.1.0.tar.bz2 New: ---- libksba-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksba.spec ++++++ --- /var/tmp/diff_new_pack.ZIv3So/_old 2011-08-01 09:47:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ZIv3So/_new 2011-08-01 09:47:25.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libksba (Version 1.1.0) +# spec file for package libksba # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,7 +18,7 @@ Name: libksba -Version: 1.1.0 +Version: 1.2.0 Release: 1 License: GPLv3+ Summary: A X.509 Library ++++++ libksba-1.1.0.tar.bz2 -> libksba-1.2.0.tar.bz2 ++++++ ++++ 12795 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 libedit for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package libedit for openSUSE:Factory checked in at Mon Aug 1 09:44:22 CEST 2011. -------- --- libedit/libedit.changes 2010-04-24 23:35:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/libedit/libedit.changes 2011-07-31 22:47:34.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 31 20:45:38 UTC 2011 - crrodriguez(a)opensuse.org + +- Link with ncurses6w instead of ncurses5 +- Do not inject artificial dependencies on other packages + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libedit-20100424-3.0-ncurses.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libedit.spec ++++++ --- /var/tmp/diff_new_pack.cyPpFL/_old 2011-08-01 09:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.cyPpFL/_new 2011-08-01 09:43:46.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libedit (Version 3.0.snap20100424) +# spec file for package libedit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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: libedit Version: 3.0.snap20100424 -Release: 1 +Release: 7 %define pkg_name libedit %define pkg_version 20100424-3.0 # @@ -28,13 +28,14 @@ Group: Development/Libraries/C and C++ # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ ncurses-devel +BuildRequires: gcc-c++ ncurses-devel pkgconfig # Url: http://www.thrysoee.dk/editline/ # http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz Source: %{pkg_name}-%{pkg_version}.tar.bz2 Source1: README.SuSE Patch1: libedit-downgrade_autoconf.patch +Patch2: libedit-20100424-3.0-ncurses.patch # Summary: Command Line Editing and History Library @@ -55,6 +56,7 @@ %package -n %{library_name} + License: BSD3c Group: Development/Libraries/C and C++ Provides: %{pkg_name} = %{version}-%{release} @@ -79,7 +81,7 @@ Group: Development/Libraries/C and C++ Requires: %{library_name} = %{version} Provides: %{library_name}-devel = %{version}-%{release} -Requires: ncurses-devel +Requires: glibc-devel # Summary: Development files for libedit @@ -100,6 +102,7 @@ %setup -n %{pkg_name}-%{pkg_version} %{__cp} %{S:1} . %patch1 +%patch2 %build NOCONFIGURE=1 autoreconf -fiv @@ -116,6 +119,9 @@ %clean %{?buildroot:%__rm -rf "%{buildroot}"} +%check +make check + %post -n %{library_name} -p /sbin/ldconfig %postun -n %{library_name} -p /sbin/ldconfig ++++++ libedit-20100424-3.0-ncurses.patch ++++++ --- configure.ac.orig +++ configure.ac @@ -34,7 +34,7 @@ EL_MANTYPE AC_CHECK_LIB(curses, tgetent,, - [AC_CHECK_LIB(ncurses, tgetent,, + [AC_CHECK_LIB(ncursesw, tgetent,, [AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) --- src/Makefile.am.orig +++ src/Makefile.am @@ -44,6 +44,7 @@ libedit_la_SOURCES = chared.c common.c e histedit.h key.h map.h chartype.h parse.h prompt.h read.h refresh.h \ search.h sig.h sys.h el_term.h tty.h vis.h filecomplete.h \ editline/readline.h +libedit_la_CFLAGS = $(shell ncursesw6-config --cflags) if WIDECHAR libedit_la_SOURCES += eln.c endif @@ -53,5 +54,5 @@ nobase_include_HEADERS = histedit.h edit nodist_libedit_la_SOURCES = $(BUILT_SOURCES) -libedit_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION) +libedit_la_LDFLAGS = $(shell ncursesw6-config --libs) -no-undefined -version-info $(LT_VERSION) --- libedit.pc.in.orig +++ libedit.pc.in @@ -7,6 +7,6 @@ Name: libedit Description: command line editor library provides generic line editing, history, and tokenization functions. Version: @VERSION@ Requires: -Libs: -L${libdir} -ledit @LIBS@ +Libs: -ledit Cflags: -I${includedir} -I${includedir}/editline ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Mon Aug 1 09:43:30 CEST 2011. -------- --- openldap2/openldap2-client.changes 2011-03-29 17:31:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/openldap2/openldap2-client.changes 2011-07-07 17:04:11.000000000 +0200 @@ -1,0 +2,35 @@ +Thu Jul 7 14:43:05 UTC 2011 - rhafer(a)suse.de + +- Update to 2.4.26 + * Added libldap LDAP_OPT_X_TLS_PACKAGE (ITS#6969) + * Fixed libldap descriptor leak (ITS#6929) + * Fixed libldap socket leak (ITS#6930) + * Fixed libldap get option crash (ITS#6931) + * Fixed libldap lockup (ITS#6898) + * Fixed libldap ASYNC TLS setup (ITS#6828) + * Fixed libldap with missing \n terminations (ITS#6947) + * Fixed tools double free (ITS#6946) + * Fixed tools verbose output (ITS#6977) + * Fixed ldapmodify SEGV on invalid LDIF (ITS#6978) + * Added slapd extra_attrs database option (ITS#6513) + * Fixed slapd asserts (ITS#6932) + * Fixed slapd configfile param on windows (ITS#6933) + * Fixed slapd config with global chaining (ITS#6843) + * Fixed slapd uninitialized variables (ITS#6935) + * Fixed slapd config objectclass is readonly (ITS#6963) + * Fixed slapd entry response with control (ITS#6899) + * Fixed slapd with unknown attrs (ITS#6819) + * Fixed slapd normalization of schema RDN (ITS#6967) + * Fixed slapd operations cache to 10 op limit (ITS#6944) + * Fixed slapd syncrepl crash with non-replicated ops (ITS#6892) + * Fixed slapd-bdb/hdb with sparse index ranges (ITS#6961) + * Fixed back-ldap ppolicy updates (ITS#6711) + * Fixed back-ldap with id-assert (ITS#6817) + * Fixed various slapo-pcache issues (ITS#6823, ITS#6950, + ITS#6951, ITS#6953, ITS#6954) + * Fixed slapo-pcache database corruption (ITS#6831) + * Fixed slapo-syncprov with replicated subtrees (ITS#6872) +- backported delete support for child entries of overlays from + master (bnc#704398) + +------------------------------------------------------------------- openldap2.changes: same change calling whatdependson for head-i586 Old: ---- openldap-2.3.37.tar.bz2 openldap-2.4.25.tar.bz2 New: ---- 0011-config-delete-overlay-fixes.dif 0012-backport-ConfigLDAPdel-callback-from-current-master.dif openldap-2.3.37.tgz openldap-2.4.26.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -24,7 +24,7 @@ %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif -Version: 2.4.25 +Version: 2.4.26 Release: 1 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 @@ -45,7 +45,7 @@ Summary: The OpenLDAP commandline client tools %endif AutoReqProv: on -Source: openldap-%{version}.tar.bz2 +Source: openldap-%{version}.tgz Source1: openldap-rc.tgz Source2: addonschema.tar.gz Source3: DB_CONFIG @@ -53,7 +53,7 @@ Source5: README.update Source6: README.dynamic-overlays Source7: schema2ldif -Source100: openldap-2.3.37.tar.bz2 +Source100: openldap-2.3.37.tgz Patch1: 0001-build-adjustments.dif Patch2: 0002-slapd.conf.dif Patch3: 0003-LDAPI-socket-location.dif @@ -64,6 +64,8 @@ Patch8: 0008-Recover-on-DB-version-change.dif Patch9: 0009-unregister_supported_control-backport.dif Patch10: 0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif +Patch11: 0011-config-delete-overlay-fixes.dif +Patch12: 0012-backport-ConfigLDAPdel-callback-from-current-master.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "openldap2" @@ -240,6 +242,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 @@ -481,10 +485,7 @@ %{_libdir}/libldap*.so.* EOF cat > openldap2-devel.filelist <<EOF -/usr/include/lber.h -/usr/include/lber_types.h -/usr/include/ldap*.h -/usr/include/slapi-plugin.h +/usr/include/*.h %{_libdir}/liblber.a %{_libdir}/liblber.so %{_libdir}/libldap*.a openldap2.spec: same change ++++++ 0001-build-adjustments.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From f8a35cec5591b61c3a39bb76a5410439e79d6aaf Mon Sep 17 00:00:00 2001 +From 43a8df1cab3f7bafb34b3356833779e6e2f0eaf1 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:04:07 +0200 Subject: build-adjustments @@ -20,10 +20,10 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@$(ldap_subdir) diff --git a/configure.in b/configure.in -index 0e44858..4f15898 100644 +index 0872d81..225647b 100644 --- a/configure.in +++ b/configure.in -@@ -67,7 +67,9 @@ dnl Determine host platform +@@ -69,7 +69,9 @@ dnl Determine host platform dnl we try not to use this for much AC_CANONICAL_TARGET([]) ++++++ 0002-slapd.conf.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From cd4cb8676956b0db50fae7cc0ccb110d40788644 Mon Sep 17 00:00:00 2001 +From 3a5f7ce7960e64d49ad104cc9abc7941b454d933 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:05:49 +0200 Subject: slapd.conf ++++++ 0003-LDAPI-socket-location.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From dcee2b0d5e2fdcc3224ea315c49057bb6b763fac Mon Sep 17 00:00:00 2001 +From c5b25d50557bb79a54654699d47af29342157ad9 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:06:42 +0200 Subject: LDAPI socket location ++++++ 0004-libldap-use-gethostbyname_r.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From 642b5d51f4fec7047de3692c5da3521a6a749ec2 Mon Sep 17 00:00:00 2001 +From 119f2c14aac61a04d98719b399266c1ed235793a Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:08:03 +0200 Subject: libldap use gethostbyname_r ++++++ 0005-pie-compile.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From fea5da62cd357a4fe5811b6399c5b32a1b43f455 Mon Sep 17 00:00:00 2001 +From 34e2af586533bf43e2fec55e707fa4d51ca6634c Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile ++++++ 0006-assorted-fixes-for-back-config-DELETE-support.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,14 +1,14 @@ -From a9a050afc3983cfcaba8a96085c97b5a213199f5 Mon Sep 17 00:00:00 2001 +From 1b23710affd68704d8fb66ba42901fa7aed1a379 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:08:56 +0200 Subject: assorted fixes for back-config DELETE support diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c -index 623940b..47671bc 100644 +index 006647b..3354c09 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c -@@ -5973,13 +5973,26 @@ config_back_delete( Operation *op, SlapReply *rs ) +@@ -6050,13 +6050,26 @@ config_back_delete( Operation *op, SlapReply *rs ) rs->sr_err = LDAP_UNWILLING_TO_PERFORM; } else if ( op->o_abandon ) { rs->sr_err = SLAPD_ABANDON; @@ -37,7 +37,7 @@ /* remove CfEntryInfo from the siblings list */ if ( ce->ce_parent->ce_kids == ce ) { -@@ -6041,6 +6054,7 @@ config_back_delete( Operation *op, SlapReply *rs ) +@@ -6118,6 +6131,7 @@ config_back_delete( Operation *op, SlapReply *rs ) #else rs->sr_err = LDAP_UNWILLING_TO_PERFORM; #endif /* SLAP_CONFIG_DELETE */ ++++++ 0007-No-Build-date-and-time-in-binaries.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From ffa5afc69917bbe153dcbddfbfac7d7b30eb0f9a Mon Sep 17 00:00:00 2001 +From 708185d30ee5a94ca4d98707521620291c8ddd1d Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez <cristian.rodriguez(a)opensuse.org> Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: No Build date and time in binaries ++++++ 0008-Recover-on-DB-version-change.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From 6821a349975bad1bb6b85c4bf6ab82be92b5c51e Mon Sep 17 00:00:00 2001 +From 1ae2909f2464955fde817f3c8447724e4d5035c3 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: Recover on DB version change ++++++ 0009-unregister_supported_control-backport.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From bf8d97b961515d698a7c9816e2af1feaa538b6bf Mon Sep 17 00:00:00 2001 +From 601cde61e0ad14e804a4f1bf54b6fac934aaad4b Mon Sep 17 00:00:00 2001 From: ralf <ralf> Date: Wed, 30 Jun 2010 10:38:01 +0000 Subject: unregister_supported_control() backport @@ -15,10 +15,10 @@ overlay_unregister_control(). diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c -index e3a6b7c..4e86bfb 100644 +index cad81ab..56bcf65 100644 --- a/servers/slapd/backover.c +++ b/servers/slapd/backover.c -@@ -1074,14 +1074,22 @@ overlay_register_control( BackendDB *be, const char *oid ) +@@ -1076,14 +1076,22 @@ overlay_register_control( BackendDB *be, const char *oid ) gotit = 1; } @@ -43,7 +43,7 @@ be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1; } -@@ -1089,6 +1097,34 @@ overlay_register_control( BackendDB *be, const char *oid ) +@@ -1091,6 +1099,34 @@ overlay_register_control( BackendDB *be, const char *oid ) } void @@ -122,10 +122,10 @@ * One-time initialization of internal controls. */ diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h -index 494d201..9ed6901 100644 +index 4d0e1bb..1aebece 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h -@@ -656,6 +656,10 @@ LDAP_SLAPD_F (int) register_supported_control2 LDAP_P(( +@@ -657,6 +657,10 @@ LDAP_SLAPD_F (int) register_supported_control2 LDAP_P(( int *controlcid )); #define register_supported_control(oid, mask, exops, fn, cid) \ register_supported_control2((oid), (mask), (exops), (fn), 0, (cid)) ++++++ 0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif ++++++ --- /var/tmp/diff_new_pack.y6Mcu9/_old 2011-08-01 09:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y6Mcu9/_new 2011-08-01 09:41:39.000000000 +0200 @@ -1,4 +1,4 @@ -From aa567ba586b3f78ce9199929f2a058c17d0a6e29 Mon Sep 17 00:00:00 2001 +From b5ddeac919d767a390d7d9e3c2dac092cc4232e1 Mon Sep 17 00:00:00 2001 From: ralf <ralf> Date: Fri, 22 Jan 2010 17:01:25 +0000 Subject: Fix exposure of SSS/VLV controls (ITS#6647) @@ -11,10 +11,10 @@ is removed (additional fix for ITS#6647) diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c -index bb779e6..010a0b9 100644 +index ce3da34..7ffed1b 100644 --- a/servers/slapd/overlays/sssvlv.c +++ b/servers/slapd/overlays/sssvlv.c -@@ -1292,6 +1292,10 @@ static int sssvlv_db_init( +@@ -1295,6 +1295,10 @@ static int sssvlv_db_init( if ( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, "Failed to register VLV Request control '%s' (%d)\n", LDAP_CONTROL_VLVREQUEST, rc, 0 ); @@ -25,7 +25,7 @@ return rc; } } -@@ -1327,6 +1331,15 @@ static int sssvlv_db_destroy( +@@ -1330,6 +1334,15 @@ static int sssvlv_db_destroy( ldap_pvt_thread_mutex_destroy( &sort_conns_mutex ); } ++++++ 0011-config-delete-overlay-fixes.dif ++++++ >From 0ca1fbc64f2f02cbdff0827e4ca1bbe312bebc2f Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Fri, 22 Jan 2010 11:18:46 +0100 Subject: config-delete overlay fixes - unregister controls when removing overlays from cn=config (syncprov, ppolicy, valsort, chain and sssvlv) - Send error to active psearches upon syncprov overlay removal - syncprov: reset BackendInfo to original value after checkpoint. Leaks memory otherwise (with -DSLAP_CONFIG_DELETE) bnc#548773 diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c index 41bb6ef..8f37efb 100644 --- a/servers/slapd/back-ldap/chain.c +++ b/servers/slapd/back-ldap/chain.c @@ -1979,6 +1979,11 @@ ldap_chain_db_close( BackendDB *be, ConfigReply *cr ) { +#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR +#ifdef SLAP_CONFIG_DELETE + overlay_unregister_control( be, LDAP_CONTROL_X_CHAINING_BEHAVIOR ); +#endif /* SLAP_CONFIG_DELETE */ +#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */ return ldap_chain_db_func( be, db_close ); } diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index 43cc345..048bf89 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -2308,6 +2308,11 @@ ppolicy_close( slap_overinst *on = (slap_overinst *) be->bd_info; pp_info *pi = on->on_bi.bi_private; + +#ifdef SLAP_CONFIG_DELETE + overlay_unregister_control( be, LDAP_CONTROL_PASSWORDPOLICYREQUEST ); +#endif /* SLAP_CONFIG_DELETE */ + /* Perhaps backover should provide bi_destroy hooks... */ ov_count--; if ( ov_count <=0 && pwcons ) { diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 1100de7..814f95e 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -3143,6 +3143,7 @@ syncprov_db_close( { slap_overinst *on = (slap_overinst *) be->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; + syncops *so, *sonext; if ( slapMode & SLAP_TOOL_MODE ) { return 0; @@ -3162,6 +3163,20 @@ syncprov_db_close( syncprov_checkpoint( op, on ); } +#ifdef SLAP_CONFIG_DELETE + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + for ( so=si->si_ops, sonext=so; so; so=sonext ) { + SlapReply rs = {REP_RESULT}; + rs.sr_err = LDAP_UNAVAILABLE; + send_ldap_result( so->s_op, &rs ); + sonext=so->s_next; + syncprov_drop_psearch( so, 0); + } + si->si_ops=NULL; + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); + overlay_unregister_control( be, LDAP_CONTROL_SYNC ); +#endif /* SLAP_CONFIG_DELETE */ + return 0; } diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c index 80d9382..033cbf6 100644 --- a/servers/slapd/overlays/valsort.c +++ b/servers/slapd/overlays/valsort.c @@ -490,6 +490,10 @@ valsort_destroy( slap_overinst *on = (slap_overinst *)be->bd_info; valsort_info *vi = on->on_bi.bi_private, *next; +#ifdef SLAP_CONFIG_DELETE + overlay_unregister_control( be, LDAP_CONTROL_VALSORT ); +#endif /* SLAP_CONFIG_DELETE */ + for (; vi; vi = next) { next = vi->vi_next; ch_free( vi->vi_dn.bv_val ); diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 1aebece..bb0dd63 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -484,6 +484,9 @@ LDAP_SLAPD_F (void) overlay_move LDAP_P(( #ifdef SLAP_CONFIG_DELETE LDAP_SLAPD_F (void) overlay_remove LDAP_P(( BackendDB *be, slap_overinst *on )); +LDAP_SLAPD_F (void) overlay_unregister_control LDAP_P(( + BackendDB *be, + const char *oid )); #endif /* SLAP_CONFIG_DELETE */ LDAP_SLAPD_F (int) overlay_callback_after_backover LDAP_P(( Operation *op, slap_callback *sc, int append )); -- 1.7.3.4 ++++++ 0012-backport-ConfigLDAPdel-callback-from-current-master.dif ++++++ >From e9c58d8eb653e2e1fa8d84f8631dcc3fa5965db2 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <ralf(a)openldap.org> Date: Tue, 15 Mar 2011 16:57:41 +0000 Subject: backport ConfigLDAPdel callback from current master bnc#704398 diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 3354c09..309668e 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -6047,10 +6047,12 @@ config_back_delete( Operation *op, SlapReply *rs ) rs->sr_matched = last->ce_entry->e_name.bv_val; rs->sr_err = LDAP_NO_SUCH_OBJECT; } else if ( ce->ce_kids ) { - rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF; } else if ( op->o_abandon ) { rs->sr_err = SLAPD_ABANDON; - } else if ( ce->ce_type == Cft_Overlay || ce->ce_type == Cft_Database){ + } else if ( ce->ce_type == Cft_Overlay || + ce->ce_type == Cft_Database || + ce->ce_type == Cft_Misc ){ char *iptr; int count, ixold; @@ -6058,7 +6060,46 @@ config_back_delete( Operation *op, SlapReply *rs ) if ( ce->ce_type == Cft_Overlay ){ overlay_remove( ce->ce_be, (slap_overinst *)ce->ce_bi ); - } else { /* Cft_Database*/ + } else if ( ce->ce_type == Cft_Misc ) { + /* + * only Cft_Misc objects that have a co_lddel handler set in + * the ConfigOCs struct can be deleted. This code also + * assumes that the entry can be only have one objectclass + * with co_type == Cft_Misc + */ + ConfigOCs co, *coptr; + Attribute *oc_at; + int i; + + oc_at = attr_find( ce->ce_entry->e_attrs, + slap_schema.si_ad_objectClass ); + if ( !oc_at ) { + rs->sr_err = LDAP_OTHER; + rs->sr_text = "objectclass not found"; + ldap_pvt_thread_pool_resume( &connection_pool ); + goto out; + } + for ( i=0; !BER_BVISNULL(&oc_at->a_nvals[i]); i++ ) { + co.co_name = &oc_at->a_nvals[i]; + coptr = avl_find( CfOcTree, &co, CfOc_cmp ); + if ( coptr == NULL || coptr->co_type != Cft_Misc ) { + continue; + } + if ( ! coptr->co_lddel || coptr->co_lddel( ce, op ) ){ + rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + if ( ! coptr->co_lddel ) { + rs->sr_text = "No delete handler found"; + } else { + rs->sr_err = LDAP_OTHER; + /* FIXME: We should return a helpful error message + * here */ + } + ldap_pvt_thread_pool_resume( &connection_pool ); + goto out; + } + break; + } + } else if (ce->ce_type == Cft_Database ) { if ( ce->ce_be == frontendDB || ce->ce_be == op->o_bd ){ rs->sr_err = LDAP_UNWILLING_TO_PERFORM; rs->sr_text = "Cannot delete config or frontend database"; @@ -6128,10 +6169,10 @@ config_back_delete( Operation *op, SlapReply *rs ) } else { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; } +out: #else rs->sr_err = LDAP_UNWILLING_TO_PERFORM; #endif /* SLAP_CONFIG_DELETE */ -out: send_ldap_result( op, rs ); return rs->sr_err; } diff --git a/servers/slapd/config.h b/servers/slapd/config.h index 9c037d4..d79ae74 100644 --- a/servers/slapd/config.h +++ b/servers/slapd/config.h @@ -100,12 +100,21 @@ typedef int (ConfigLDAPadd)( typedef int (ConfigCfAdd)( Operation *op, SlapReply *rs, Entry *parent, struct config_args_s *ca ); +#ifdef SLAP_CONFIG_DELETE +/* Called when deleting a Cft_Misc Child object from cn=config */ +typedef int (ConfigLDAPdel)( + CfEntryInfo *ce, Operation *op ); +#endif + typedef struct ConfigOCs { const char *co_def; ConfigType co_type; ConfigTable *co_table; ConfigLDAPadd *co_ldadd; ConfigCfAdd *co_cfadd; +#ifdef SLAP_CONFIG_DELETE + ConfigLDAPdel *co_lddel; +#endif ObjectClass *co_oc; struct berval *co_name; } ConfigOCs; -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pulseaudio for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at Mon Aug 1 09:40:09 CEST 2011. -------- --- pulseaudio/pulseaudio.changes 2011-07-22 18:04:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2011-07-27 19:18:49.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 27 13:29:24 CEST 2011 - tiwai(a)suse.de + +- Updated to version 0.9.23: + Bugfix only update, see changelog at + http://pulseaudio.org/milestone/0.9.23 +- Suppress too verbose error message at socket connection failure + from a client; this is annoying when alsa-plugins-pulse fallback + is used + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bnc666350-fix-incorrect-check-of-return-value.patch pulseaudio-0.9.22.tar.bz2 New: ---- pulseaudio-0.9.23.tar.gz suppress-socket-error-msg.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.troV6x/_old 2011-08-01 09:39:37.000000000 +0200 +++ /var/tmp/diff_new_pack.troV6x/_new 2011-08-01 09:39:37.000000000 +0200 @@ -17,22 +17,21 @@ # norootforbuild -%define drvver 0.9.22 +%define drvver 0.9.23 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.22 -Release: 10 +Version: 0.9.23 +Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons -Source: %{name}-%{version}.tar.bz2 +Source: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.… Source1: default.pa-for-gdm Source2: setup-pulseaudio Source3: sysconfig.sound-pulseaudio Source99: baselibs.conf Patch0: disabled-start.diff -# PATCH-FIX-UPSTREAM bnc666350-fix-incorrect-check-of-return-value.patch sreeves(a)novell.com -- fix to correctly report realtime status -Patch1: bnc666350-fix-incorrect-check-of-return-value.patch +Patch1: suppress-socket-error-msg.diff Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel @@ -392,6 +391,7 @@ %{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so %{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so %{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so +%{_libdir}/pulse-%{drvver}/modules/module-echo-cancel.so %dir %{_datadir}/pulseaudio %dir %{_datadir}/pulseaudio/alsa-mixer %dir %{_datadir}/pulseaudio/alsa-mixer/paths @@ -438,6 +438,7 @@ %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so %{_libdir}/pulse-%{drvver}/modules/module-jack-source.so +%{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so %files module-bluetooth %defattr(-,root,root) @@ -482,9 +483,7 @@ %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/libpulse.vapi +%{_datadir}/vala %files utils %defattr(-,root,root) ++++++ suppress-socket-error-msg.diff ++++++ --- src/pulsecore/socket-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -258,7 +258,7 @@ c->local = pa_socket_address_is_local(sa); if ((c->fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) { - pa_log("socket(): %s", pa_cstrerror(errno)); + /*pa_log("socket(): %s", pa_cstrerror(errno));*/ return -1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ctags for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package ctags for openSUSE:Factory checked in at Mon Aug 1 09:39:18 CEST 2011. -------- --- ctags/ctags.changes 2009-12-21 23:40:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/ctags/ctags.changes 2011-07-29 19:05:42.000000000 +0200 @@ -1,0 +2,43 @@ +Fri Jul 29 16:49:36 UTC 2011 - puzel(a)novell.com + +- update to ctags-5.8 + - Removed ".ml" as a Lisp extension (now OCaml) [Lisp]. + - Added support for Ant language, contributed by David Fishburn. + - Added support for DOS Batch language, contributed by David + Fishburn. + - Added support for Flex (Adobe) language, contributed by David + Fishburn. + - Added support for MATLAB language, contributed by David Fishburn. + - Added support for Objective Camel (OCaml), provided by Vincent + Berthoux + - Added support for TeX language, contributed by David Fishburn. + - Added support for VHDL language, contributed by Nicolas Vincent + - Added support for Pyrex/Cython declarations [Python]. + - Added support for "v" kind, for variables [Python]. + - Added support for class and member variables + - Added support for recent enhancements to Eiffel language + [Eiffel]. + - Added support for ASP classes, contributed by Zendhi Nagao; + changes meaning of 'c' kind flag [ASP]. + - Added regex support when compiling with MinGW. Gnu regex module + now included in all distributions. + - Fixed detection of triple strings inside other strings + - Fixed an endless loop with comments in triple strings + - Fixed bug where functions were sometimes seen as methods + - Fixed parsing of method parameter annotations, fix contributed by + Paolo "blaisorblade" Giarrusso + - Fixed parsing of global scope qualifiers in base class lists + - Fixed bug where namespace members were given kinds corresponding + to globals + - Fixed parsing of "else" + - Fixed parsing of derived enums + - Fixed parsing of "foreach" + - Fixed parsing of simple generic classes + - Fixed bug with detecting identifiers inside variables + - Fixed bug with detecting identifiers at the start of variables + - Fixed parsing of triple single-quoted multi-line strings +- disabled YCP parser for now (does not apply) +- add ctags-date-time.patch +- use spec-cleaner + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ctags-5.7.tar.bz2 New: ---- ctags-5.8.tar.gz ctags-date-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ctags.spec ++++++ --- /var/tmp/diff_new_pack.QyMcgI/_old 2011-08-01 09:21:22.000000000 +0200 +++ /var/tmp/diff_new_pack.QyMcgI/_new 2011-08-01 09:21:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ctags (Version 2009.12.21) +# spec file for package ctags # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,21 +18,24 @@ Name: ctags -License: GPLv2+ -Group: Development/Tools/Navigators -AutoReqProv: on -%define ctags_ver 5.7 +%define ctags_ver 5.8 %define etags_ver 17.38.1.4 -Version: 2009.12.21 +# Let the date means last update of either ctags or etags tarball +Version: 2011.7.29 Release: 1 +License: GPLv2+ Summary: A Program to Generate Tag Files for Use with vi and Other Editors Url: http://ctags.sourceforge.net/ -Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{ctags_ver}.tar… +Group: Development/Tools/Navigators +Source0: ctags-%{ctags_ver}.tar.gz Source1: etags-%{etags_ver}.tar.gz Source2: README.SuSE -Patch0: ctags-%{ctags_ver}.diff -Patch1: ctags-ycp-parser.diff -Patch2: etags-%{etags_ver}.diff +Patch1: ctags-5.7.diff +# No resources to make this patch work with ctags-5.8 (applied to ctags-5.7) +# Anyone is welcome to make it work again. +#Patch2: ctags-ycp-parser.diff +Patch3: ctags-date-time.patch +Patch4: etags-%{etags_ver}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,51 +47,44 @@ Pascal, Cobol, Ada, Perl, LaTeX, Scheme, Emacs Lisp/Common Lisp, Postscript, Erlang, Python, Prolog, and most assembler-like syntaxes. - - -Authors: --------- - Darren Hiebert <darren(a)hiebert.com> - Ken Arnold - Francesco Potort� <pot(a)gnu.org> - %prep %setup -q -n ctags-%{ctags_ver} -b 1 -%patch0 %patch1 +#%#patch2 +%patch3 -p1 cd ../etags-%{etags_ver} -%patch2 +%patch4 %build CC=gcc -CFLAGS="$RPM_OPT_FLAGS -Wall" +CFLAGS="%{optflags} -Wall" export CFLAGS CC ./configure --prefix=/usr --mandir=%{_mandir} --disable-etags -make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd ../etags-%{etags_ver} CFLAGS="$CFLAGS -DSTDC_HEADERS -DHAVE_UNISTD_H -DHAVE_GETCWD" $CC $CFLAGS -o etags etags.c $CC $CFLAGS -DCTAGS -o gnuctags etags.c %install -make install prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT%{_mandir} -mkdir -p $RPM_BUILD_ROOT%{_docdir}/ctags/Exuberant_Ctags -install -m 644 COPYING EXTENDING.html FAQ README $RPM_BUILD_ROOT%{_docdir}/ctags/Exuberant_Ctags -install -m 644 %{S:2} $RPM_BUILD_ROOT%{_docdir}/ctags +make install prefix=%{buildroot}/usr mandir=%{buildroot}%{_mandir} +mkdir -p %{buildroot}%{_docdir}/ctags/Exuberant_Ctags +install -m 644 COPYING EXTENDING.html FAQ README %{buildroot}%{_docdir}/ctags/Exuberant_Ctags +install -m 644 %{SOURCE2} %{buildroot}%{_docdir}/ctags cd ../etags-%{etags_ver} -install -m 755 etags gnuctags $RPM_BUILD_ROOT/usr/bin -install -m 644 etags.1 $RPM_BUILD_ROOT%{_mandir}/man1 -ln -sf etags.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/gnuctags.1.gz -install -m 644 ETAGS.README $RPM_BUILD_ROOT%{_docdir}/ctags +install -m 755 etags gnuctags %{buildroot}%{_prefix}/bin +install -m 644 etags.1 %{buildroot}%{_mandir}/man1 +ln -sf etags.1.gz %{buildroot}%{_mandir}/man1/gnuctags.1.gz +install -m 644 ETAGS.README %{buildroot}%{_docdir}/ctags %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -/usr/bin/ctags -/usr/bin/gnuctags -/usr/bin/etags +%{_bindir}/ctags +%{_bindir}/gnuctags +%{_bindir}/etags %{_mandir}/man1/ctags.1.gz %{_mandir}/man1/gnuctags.1.gz %{_mandir}/man1/etags.1.gz ++++++ ctags-date-time.patch ++++++ Index: ctags-5.8/options.c =================================================================== --- ctags-5.8.orig/options.c +++ ctags-5.8/options.c @@ -924,7 +924,6 @@ static void printProgramIdentification ( printf ("%s %s, %s %s\n", PROGRAM_NAME, PROGRAM_VERSION, PROGRAM_COPYRIGHT, AUTHOR_NAME); - printf (" Compiled: %s, %s\n", __DATE__, __TIME__); printf (" Addresses: <%s>, %s\n", AUTHOR_EMAIL, PROGRAM_URL); printFeatureList (); } Index: ctags-5.8/main.c =================================================================== --- ctags-5.8.orig/main.c +++ ctags-5.8/main.c @@ -93,17 +93,6 @@ */ static struct { long files, lines, bytes; } Totals = { 0, 0, 0 }; -#ifdef AMIGA -# include "ctags.h" - static const char *VERsion = "$VER: "PROGRAM_NAME" "PROGRAM_VERSION" " -# ifdef __SASC - __AMIGADATE__ -# else - __DATE__ -# endif - " "AUTHOR_NAME" $"; -#endif - /* * FUNCTION PROTOTYPES */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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