Hello community, here is the log from the commit of package i4l-base for openSUSE:Factory checked in at 2012-05-03 10:57:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i4l-base (Old) and /work/SRC/openSUSE:Factory/.i4l-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "i4l-base", Maintainer is "kkeil@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/i4l-base/i4l-base.changes 2011-10-16 12:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.i4l-base.new/i4l-base.changes 2012-05-03 10:57:14.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Mar 10 08:05:07 UTC 2012 - jengelh@medozas.de + +- Employ shlib policy for libcapi20.so +- Remove .la files in standard directories + +------------------------------------------------------------------- +Wed Feb 8 15:54:49 UTC 2012 - dlovasko@suse.com + +- fixed bnc#743146 - added -fPIE/-pie/-fPIC flags to compilation and linking of isdnctrl and vboxbeep + +------------------------------------------------------------------- +Tue Jan 3 20:31:14 UTC 2012 - jengelh@medozas.de + +- Use desired interpreter properly in %post +- Remove redundant sections + +------------------------------------------------------------------- +Thu Dec 22 12:19:33 CET 2011 - dmueller@suse.de + +- fix build on arm (fix va_list usage) + +------------------------------------------------------------------- New: ---- arm-fix-va_arg-usage.diff isdnctrl-pie.patch vboxbeep-pie.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.m424rF/_old 2012-05-03 10:57:16.000000000 +0200 +++ /var/tmp/diff_new_pack.m424rF/_new 2012-05-03 10:57:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package i4l-base # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,22 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: i4l-base -BuildRequires: atk-devel cairo-devel freetype2-devel gcc-c++ glib2-devel gtk2-devel intltool libpcap-devel libpng-devel -BuildRequires: libsndfile-devel ncurses-devel openssl-devel ppp-devel sgmltool tcl-devel tk-devel xorg-x11 xorg-x11-devel +BuildRequires: atk-devel +BuildRequires: cairo-devel +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: libpcap-devel +BuildRequires: libpng-devel +BuildRequires: libsndfile-devel BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: ppp-devel +BuildRequires: sgmltool +BuildRequires: tcl-devel +BuildRequires: tk-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel Url: http://www.isdn4linux.de -License: GPLv2+ ; LGPLv2.1+ -Group: Hardware/ISDN Provides: i4l -AutoReqProv: on Obsoletes: i4l Version: 2011.8.29 -Release: 1 +Release: 0 Summary: ISDN for Linux Basic Utilities +License: GPL-2.0+ ; LGPL-2.1+ +Group: Hardware/ISDN Source: isdn4k-utils.v3.13.tar.bz2 Source1: i4l_suse.tar.bz2 Source2: firmware.tar.bz2 @@ -40,12 +53,15 @@ Source6: baselibs.conf Patch: isdn4k-utils.dif Patch1: capi20_fixes.diff +Patch4: arm-fix-va_arg-usage.diff Patch11: i4l_suse.diff Patch12: i4l_suse-sleep.diff Patch31: divactrl_2.1-gcc.diff Patch32: divactrl_2.1-fix.diff Patch33: divactrl_2.1-dprintf.diff #Patch10: i4l_suse-auto.diff +Patch34: vboxbeep-pie.patch +Patch35: isdnctrl-pie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/cat fileutils %fillup_prereq PreReq: permissions @@ -62,12 +78,9 @@ connections are also included. %package -n ppp-userpass -License: GPLv2+ ; LGPLv2.1+ -Version: 2011.8.29 -Release: 1 Summary: Password plugin for pppd +License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Networking/PPP -AutoReqProv: on Requires: ppp = %ppp_version %description -n ppp-userpass @@ -76,16 +89,29 @@ chap-secrets files. It is particularly useful to define ppp connections in a single pppd options file under /etc/ppp/peers . +%package -n libcapi20-2 +Summary: CAPI 2.0 library +License: LGPL-2.1+ +Group: System/Libraires + +%description -n libcapi20-2 +This package contains the CAPI 2.0 runtime library files. + +%package -n libcapi20-3 +Summary: CAPI 2.0 library +License: LGPL-2.1+ +Group: System/Libraires + +%description -n libcapi20-3 +This package contains the CAPI 2.0 runtime library files. + %package -n capi4linux -License: GPLv2+ ; LGPLv2.1+ -Version: 2011.8.29 -Release: 1 -Summary: CAPI 2.0 library and associated tools +Summary: CAPI 2.0 tools +License: GPL-2.0+ ; LGPL-2.1+ Group: Hardware/ISDN Provides: i4l:/usr/bin/capiinfo Requires: i4l-base ppp-userpass Requires: ppp = %ppp_version -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: capi4linux-64bit @@ -100,13 +126,11 @@ of ISDN devices. %package -n capi4linux-devel -License: GPLv2+ ; LGPLv2.1+ -Version: 2011.8.29 -Release: 1 Summary: CAPI 2.0 library files for development +License: GPL-2.0+ ; LGPL-2.1+ Group: Hardware/ISDN -Requires: capi4linux -AutoReqProv: on +Requires: capi4linux = %version +Requires: libcapi20-2 = %version, libcapi20-3 = %version # bug437293 %ifarch ppc64 Obsoletes: capi4linux-devel-64bit @@ -118,28 +142,22 @@ development. %package -n i4lfirm -License: GPLv2+ ; freely distributable, no modification -Version: 2011.8.29 -Release: 1 Summary: ISDN firmware for active ISDN cards +License: GPL-2.0+ ; freely distributable, no modification Group: Hardware/ISDN Requires: i4l-base -AutoReqProv: on %description -n i4lfirm ISDN firmware for active ISDN cards. %package -n i4l-vbox -License: GPLv2+ -Version: 2011.8.29 -Release: 1 Obsoletes: vbox Provides: vbox vbox2b4 Provides: i4l:/usr/bin/vbox Requires: i4l-base Summary: A Voice Answering Machine for isdn4linux +License: GPL-2.0+ Group: Hardware/ISDN -AutoReqProv: on %description -n i4l-vbox i4l-vbox is a voice answering machine for isdn4linux. It is a @@ -153,12 +171,9 @@ configuration files. %package -n ant-phone -License: GPLv2+ -Version: 2011.8.29 -Release: 1 Summary: A telephone application +License: GPL-2.0+ Group: Hardware/ISDN -AutoReqProv: on %description -n ant-phone ANT is a telephone application written for GNU/Linux, I4L (ISDN4Linux, @@ -166,12 +181,9 @@ System). %package -n i4l-isdnlog -License: GPLv2+ -Version: 2011.8.29 -Release: 1 Summary: An ISDN line logging and control utility +License: GPL-2.0+ Group: Hardware/ISDN -AutoReqProv: on Provides: i4l:/usr/sbin/isdnlog %description -n i4l-isdnlog @@ -185,7 +197,10 @@ %prep %setup -q -n isdn4k-utils -b 1 -b 2 -b 3 %patch +%patch34 -p1 +%patch35 -p1 %patch1 -p1 +%patch4 chmod a+x */configure mv -f eicon/firmware/eicon_firm.tgz eicon/firmware/firmware.tgz mv -f eicon/firmware ../divactrl_2.1/ @@ -424,18 +439,14 @@ install -d $RPM_BUILD_ROOT/lib/udev/devices ln -sn isdnctrl0 $RPM_BUILD_ROOT/lib/udev/devices/isdnctrl rm -f $RPM_BUILD_ROOT/dev/isdnctrl +rm -f "%buildroot/%_libdir"/*.la %find_lang ant-phone -%clean -rm -rf $RPM_BUILD_ROOT - -%post -#!/bin/bash -# +%post -p /bin/bash # install/doinst.sh - to be done after extraction # # -# dank an werner f�r diesen code ;))) +# dank an werner für diesen code ;))) # if [ -f etc/SuSE-release ] ; then while read line ; do @@ -467,8 +478,11 @@ %run_permissions exit 0 -%post -n capi4linux -ldconfig +%post -n libcapi20-2 -p /sbin/ldconfig + +%post -n libcapi20-3 -p /sbin/ldconfig + +%post -n capi4linux -p /sbin/ldconfig %preun %stop_on_removal isdn @@ -476,8 +490,12 @@ %postun %{insserv_cleanup} -%postun -n capi4linux -ldconfig +%postun -n libcapi20-2 -p /sbin/ldconfig + +%postun -n libcapi20-3 -p /sbin/ldconfig + +%postun -n capi4linux -p /sbin/ldconfig + %verifyscript %verify_permissions -e /usr/bin/vboxbeep @@ -655,6 +673,14 @@ %doc /usr/share/man/man8/mkzonedb.8.gz %doc %{_defaultdocdir}/i4l-isdnlog +%files -n libcapi20-2 +%defattr(-,root,root) +%_libdir/libcapi20.so.2* + +%files -n libcapi20-3 +%defattr(-,root,root) +%_libdir/libcapi20.so.3* + %files -n capi4linux %defattr(-,root,root) ### /etc/ppp @@ -674,7 +700,6 @@ /usr/bin/capifax /usr/bin/capifaxrcvd ### /usr/lib -/usr/%_lib/libcapi20.so* %_libdir/capi/ %_libdir/pppd/%ppp_version_short/capiplugin.so ### /lib/firmware/isdn @@ -696,7 +721,7 @@ /usr/include/capi20.h /usr/include/capicmd.h /usr/include/capiutils.h -/usr/%_lib/libcapi20.la +/usr/%_lib/libcapi20.so /usr/%_lib/libcapi20.a /usr/%_lib/libcapi20dyn.a ++++++ arm-fix-va_arg-usage.diff ++++++ --- ipppd/main.c +++ ipppd/main.c @@ -1205,7 +1205,7 @@ unsigned long val=0; char *str, *f, *buf0; unsigned char *p; - void *a; + va_list a; char num[32]; time_t t; static char hexchars[] = "0123456789abcdef"; @@ -1297,11 +1297,7 @@ break; case 'r': f = va_arg(args, char *); - /* - * XXX We assume a va_list is either a pointer or an array, so - * what gets passed for a va_list is like a void * in some sense. - */ - a = va_arg(args, void *); + a = va_arg(args, va_list); #ifdef __alpha__ /* always do this? */ n = fmtmsg(buf, buflen + 1, f, a); #else ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.m424rF/_old 2012-05-03 10:57:16.000000000 +0200 +++ /var/tmp/diff_new_pack.m424rF/_new 2012-05-03 10:57:16.000000000 +0200 @@ -1,2 +1,7 @@ +libcapi20-2 +libcapi20-3 capi4linux - -/pppd + -/pppd +capi4linux-devel + requires "libcapi20-2-<targettype> = <version>" + requires "libcapi20-3-<targettype> = <version>" ++++++ isdnctrl-pie.patch ++++++ Index: isdn4k-utils/isdnctrl/Makefile.in =================================================================== --- isdn4k-utils.orig/isdnctrl/Makefile.in +++ isdn4k-utils/isdnctrl/Makefile.in @@ -7,7 +7,7 @@ SHELL = /bin/sh CFLAGS = -Wall -O2 INCLUDES = -I. -LDFLAGS = @LIBS@ +LDFLAGS = @LIBS@ PROGRAM = isdnctrl MODULES = isdnctrl.o MANPAGES = isdnctrl.8 @@ -50,7 +50,7 @@ all: $(PROGRAM) endif %.o: %.c Makefile - $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(COPTS) -c -o $@ $< + $(CC) $(CFLAGS) -fPIC $(INCLUDES) $(DEFS) $(COPTS) -c -o $@ $< all: $(PROGRAM) @@ -74,7 +74,7 @@ endif rm -f $<.tmp $(PROGRAM): $(MODULES) - $(CC) $(CFLAGS) $(MODULES) $(LDFLAGS) -o $@ + $(CC) $(CFLAGS) -fPIE $(MODULES) $(LDFLAGS) -pie -o $@ install-man: $(MANPAGES) $(INSTALL) -d $(DESTDIR)$(MAN8DIR) ++++++ vboxbeep-pie.patch ++++++ Index: isdn4k-utils/vbox/src/Makefile.in =================================================================== --- isdn4k-utils.orig/vbox/src/Makefile.in +++ isdn4k-utils/vbox/src/Makefile.in @@ -67,13 +67,13 @@ vboxconvert.o: $(HEADERS) vboxconvert.c $(CC) $(CFLAGS) -c vboxconvert.c libvbox.o: $(HEADERS) libvbox.c - $(CC) $(CFLAGS) -c libvbox.c + $(CC) $(CFLAGS) -fPIC -c libvbox.c vboxctrl.o: $(HEADERS) vboxctrl.c $(CC) $(CFLAGS) -c vboxctrl.c vboxbeep.o: $(HEADERS) vboxbeep.c - $(CC) $(CFLAGS) -c vboxbeep.c + $(CC) $(CFLAGS) -fPIE -c vboxbeep.c vboxd.o: $(HEADERS) vboxd.c $(CC) $(CFLAGS) -DVBOXDRC='"$(VBOX_VBOXDCONF)"' -c vboxd.c @@ -140,7 +140,7 @@ vboxctrl: $(VBOXCTRLOBJS) VBOXBEEPOBJS = vboxbeep.o vboxbeep: $(VBOXBEEPOBJS) - $(CC) $(CFLAGS) $(VBOXBEEPOBJS) -o vboxbeep -L. -lvbox + $(CC) $(CFLAGS) $(VBOXBEEPOBJS) -pie -o vboxbeep -L. -lvbox #----------------------------------------------------------------------------# # Compiling vboxd # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org