April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit xdiskusage for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package xdiskusage for openSUSE:Factory checked in at Sun Apr 25 18:55:18 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xdiskusage/xdiskusage.changes 2010-03-22 22:53:23.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Mon Mar 22 21:44:13 UTC 2010 - john(a)redux.org.uk + +- Update to version 1.48.1: + + Utilises the release from the fork hosted on Google Code. + calling whatdependson for head-i586 New: ---- xdiskusage-1.48.1.tar.bz2 xdiskusage.changes xdiskusage.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdiskusage.spec ++++++ # # spec file for package xdiskusage (Version 1.48.1) # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # Note that this is NOT a relocatable package %define prefix /usr %define bindir /usr/bin %define mandir /usr/share/man %define tmppath /tmp Summary: Grapically displays the amount of disks used for by each subdirectory Name: xdiskusage Version: 1.48.1 Release: 1 Source: %{name}-%{version}.tar.bz2 License: GPLv2 %if 0%{?suse_version} Group: Applications/System %else Group: Applications/System %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: https://code.google.com/p/xdiskusage-buildfix/ BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: libstdc++-devel %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mandriva_version} %ifarch x86_64 BuildRequires: lib64x11_6-devel BuildRequires: lib64xext6-devel BuildRequires: lib64xinerama1-devel BuildRequires: lib64mesagl1-devel BuildRequires: lib64mesaglu1-devel %else BuildRequires: libx11_6-devel BuildRequires: libxext6-devel BuildRequires: libxinerama1-devel BuildRequires: libmesagl1-devel BuildRequires: libmesaglu1-devel %endif %endif %description xdiskusage is a user-friendly program to show you what is using up all your disk space. It is based on the design of xdu written by Phillip C. Dykstra. Changes have been made so it runs "du" for you, and can display the free space left on the disk, and produce a PostScript version of the display. %prep %setup -q %build export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{bindir} $RPM_BUILD_ROOT/%{mandir}/man1 make prefix=$RPM_BUILD_ROOT/%{prefix} \ mandir=$RPM_BUILD_ROOT/%{mandir} install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README %{bindir}/* %doc %attr(0644,root,root) %{mandir}/man1/* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xl2tpd for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at Sun Apr 25 18:54:49 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xl2tpd/xl2tpd.changes 2010-04-22 11:26:42.000000000 +0200 @@ -0,0 +1,304 @@ +------------------------------------------------------------------- +Thu Apr 22 09:23:57 UTC 2010 - aj(a)suse.de + +- Fix specfile, debug_package will get inserted automatically. +- Do not use license package. + +------------------------------------------------------------------- +Fri Apr 16 15:01:13 CEST 2010 - eri_zaq@please-enter-an-email-address + +- xl2tpd-1.2.4-4 +- Fix init script to stop service correctly +- *.changes +------------------------------------------------------------------- +Mon Mar 15 00:00:00 CET 2010 - k0da(a)opensuse.org + +- xl2tpd-1.2.4-3 +- avoid a huge overload of duplicated files + +------------------------------------------------------------------- +Thu Mar 11 00:00:00 CET 2010 - k0da(a)opensuse.org + +- xl2tpd-1.2.4-2 +- xl2tpd-doc-1.2.4-2 +- *-doc package +- cleanup init script + +------------------------------------------------------------------- +Wed Mar 10 00:00:00 CET 2010 - k0da(a)opensuse.org + +- xl2tpd-1.2.4-1 +- patch for init file + +------------------------------------------------------------------- +Tue Oct 28 00:00:00 CET 2008 - k0da(a)opensuse.org + +- Adjust build requires + +------------------------------------------------------------------- +Sun Oct 26 00:00:00 CEST 2008 - paul(a)xelerance.com + +- Updated Suse init scripts and spec file +- Added pfc for pppd's precompiled-active-filter + +------------------------------------------------------------------- +Fri Apr 18 00:00:00 CEST 2008 - paul(a)xelerance.com + +- Updated Suse init scripts and spec file + +------------------------------------------------------------------- +Tue Jun 26 00:00:00 CEST 2007 - paul(a)xelerance.com + +- Minor changes to spec file to accomodate new README files + +------------------------------------------------------------------- +Fri Feb 23 00:00:00 CET 2007 - paul(a)xelerance.com + +- Upgraded to 1.1.08 +- This works around the ppp-2.4.2-6.4 issue of not dying on SIGTERM + +------------------------------------------------------------------- +Mon Feb 19 00:00:00 CET 2007 - paul(a)xelerance.com + +- Upgraded to 1.1.07 +- Fixes from Tuomo Soini for pidfile handling with Fedora +- Fix hardcoded version for Source in spec file. + +------------------------------------------------------------------- +Thu Dec 7 00:00:00 CET 2006 - paul(a)xelerance.com + +- Changed space/tab replacing method + +------------------------------------------------------------------- +Wed Dec 6 00:00:00 CET 2006 - paul(a)xelerance.com + +- Added -p to keep original timestamps +- Added temporary hack to change space/tab in init file. +- Added /sbin/service dependancy + +------------------------------------------------------------------- +Tue Dec 5 00:00:00 CET 2006 - paul(a)xelerance.com + +- Changed Mr. Karlsen's name to not be a utf8 problem +- Fixed Obosoletes/Provides to be more specific wrt l2tpd. +- Added dist tag which accidentally got deleted. + +------------------------------------------------------------------- +Mon Dec 4 00:00:00 CET 2006 - paul(a)xelerance.com + +- Rebased spec file on Fedora Extras copy, but using xl2tpd as package name + +------------------------------------------------------------------- +Sun Nov 27 00:00:00 CET 2005 - paul(a)xelerance.com + +- Pulled up sourceforget.net CVS fixes. +- various debugging added, but debugging should not be on by default. +- async/sync conversion routines must be ready for possibility that the read + will block due to routing loops. +- refactor control socket handling. +- move all logic about pty usage to pty.c. Try ptmx first, if it fails try + legacy ptys +- rename log() to l2tp_log(), as "log" is a math function. +- if we aren't deamonized, then log to stderr. +- added install: and DESTDIR support. + +------------------------------------------------------------------- +Thu Oct 20 00:00:00 CEST 2005 - paul(a)xelerance.com + +- Removed suse/mandrake specifics. Comply for Fedora Extras guidelines + +------------------------------------------------------------------- +Tue Jun 21 00:00:00 CEST 2005 - jacco2(a)dds.nl + +- Added log() patch by Paul Wouters so that l2tpd compiles on FC4. + +------------------------------------------------------------------- +Sat Jun 4 00:00:00 CEST 2005 - jacco2(a)dds.nl + +- l2tpd.org has been hijacked. Project moved back to SourceForge: + http://l2tpd.sourceforge.net + +------------------------------------------------------------------- +Tue May 3 00:00:00 CEST 2005 - jacco2(a)dds.nl + +- Small Makefile fixes. Explicitly use gcc instead of cc. + Network services library was not linked on Solaris due to typo. + +------------------------------------------------------------------- +Thu Mar 17 00:00:00 CET 2005 - jacco2(a)dds.nl + +- Choosing between SysV or BSD style ptys is now configurable through + a compile-time boolean "unix98pty". + +------------------------------------------------------------------- +Fri Feb 4 00:00:00 CET 2005 - jacco2(a)dds.nl + +- Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. + Requires the N_HDLC kernel module. + +------------------------------------------------------------------- +Fri Nov 26 00:00:00 CET 2004 - jacco2(a)dds.nl + +- Updated the README. + +------------------------------------------------------------------- +Wed Nov 10 00:00:00 CET 2004 - jacco2(a)dds.nl + +- Patch by Marald Klein and Roger Luethi. Fixes writing PID file. + (http://l2tpd.graffl.net/msg01790.html) + Long overdue. Rereleasing 10jdl. + +------------------------------------------------------------------- +Tue Nov 9 00:00:00 CET 2004 - jacco2(a)dds.nl + +- [SECURITY FIX] Added fix from Debian because of a bss-based + buffer overflow. + (http://www.mail-archive.com/l2tpd-devel@l2tpd.org/msg01071.html) +- Mandrake's FreeS/WAN, Openswan and Strongswan RPMS use configuration + directories /etc/{freeswan,openswan,strongswan}. Install our + configuration files to /etc/ipsec.d and create symbolic links in + those directories. + +------------------------------------------------------------------- +Wed Aug 18 00:00:00 CEST 2004 - jacco2(a)dds.nl + +- Removed 'leftnexthop=' lines. Not relevant for recent versions + of FreeS/WAN and derivates. + +------------------------------------------------------------------- +Tue Jan 20 00:00:00 CET 2004 - jacco2(a)dds.nl + +- Added "noccp" because of too much MPPE/CCP messages sometimes. + +------------------------------------------------------------------- +Wed Dec 31 00:00:00 CET 2003 - jacco2(a)dds.nl + +- Added patch in order to prevent StopCCN messages. + +------------------------------------------------------------------- +Sat Aug 23 00:00:00 CEST 2003 - jacco2(a)dds.nl + +- MTU/MRU 1410 seems to be the lowest possible for MSL2TP. + For Windows 2000/XP it doesn't seem to matter. +- Typo in l2tpd.conf (192.168.128/25). + +------------------------------------------------------------------- +Fri Aug 8 00:00:00 CEST 2003 - jacco2(a)dds.nl + +- Added MTU/MRU 1400 to options.l2tpd. I don't know the optimal + value but some apps had problems with the default value. + +------------------------------------------------------------------- +Fri Aug 1 00:00:00 CEST 2003 - jacco2(a)dds.nl + +- Added workaround for the missing hostname bug in the MSL2TP client + ('Specify your hostname', error 629: "You have been disconnected + from the computer you are dialing"). + ++++ 107 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/xl2tpd/xl2tpd.changes calling whatdependson for head-i586 New: ---- Makefile.patch xl2tpd-1.2.4.tar.bz2 xl2tpd.changes xl2tpd.init.patch xl2tpd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xl2tpd.spec ++++++ # # spec file for package xl2tpd (Version 1.2.4) # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.4 Release: 1 License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ Group: Productivity/Networking/System Source0: %{name}-%{version}.tar.bz2 Patch0: Makefile.patch Patch1: xl2tpd.init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ppp %if %sles_version >= 10 BuildRequires: libpcap linux-kernel-headers => 2.6.23 %endif BuildRequires: libpcap-devel linux-kernel-headers Obsoletes: l2tpd <= 0.68 Provides: l2tpd = 0.69 %description xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP servers. Another important application is Virtual Private Networks where the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec, RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and Mac OS X clients. On Linux, xl2tpd can be used in combination with IPsec implementations such as Openswan. Example configuration files for such a setup are included in this RPM. xl2tpd works by opening a pseudo-tty for communicating with pppd. It runs completely in userspace but supports kernel mode L2TP. xl2tpd supports IPsec SA Reference tracking to enable overlapping internak NAT'ed IP's by different clients (eg all clients connecting from their linksys internal IP 192.168.1.101) as well as multiple clients behind the same NAT router. xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher, or via a patch in contrib for 2.4.x kernels. Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm(a)iglou.com> It was de-facto maintained by Jacco de Leeuw <jacco2(a)dds.nl> in 2002 and 2003. %package -n xl2tpd-doc License: GPLv2 Summary: Documentation for xl2tpd package Group: Documentation/Man Version: 1.2.4 Release: 1 AutoReqProv: on %description -n xl2tpd-doc This package contains the documentation for using the xl2tpd daemon %prep %setup -q %patch0 %patch1 %build make DFLAGS="$RPM_OPT_FLAGS" %install export PREFIX=/usr make DESTDIR=%{buildroot} MANDIR=%{buildroot}/%{_mandir} install install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets install -p -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample install -p -D -m755 packaging/suse/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd ln -sf /etc/init.d/xl2tpd $RPM_BUILD_ROOT/%{_sbindir}/rcxl2tpd install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd %clean rm -rf %{buildroot} %post %{fillup_and_insserv xl2tpd} # if we migrate from l2tpd to xl2tpd, copy the configs if [ -f /etc/l2tpd/l2tpd.conf ] then echo "Old /etc/l2tpd configuration found, migrating to /etc/xl2tpd" mv /etc/xl2tpd/xl2tpd.conf /etc/xl2tpd/xl2tpd.conf.rpmsave cat /etc/l2tpd/l2tpd.conf | sed "s/options.l2tpd/options.xl2tpd/" > /etc/xl2tpd/xl2tpd.conf mv /etc/ppp/options.xl2tpd /etc/ppp/options.xl2tpd.rpmsave mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets fi %preun %stop_on_removal xl2tpd exit 0 %postun %restart_on_update xl2tpd %insserv_cleanup exit 0 %files %defattr(-,root,root) %{_sbindir}/rcxl2tpd %{_sbindir}/xl2tpd %{_bindir}/pfc %dir %{_sysconfdir}/xl2tpd %config(noreplace) %{_sysconfdir}/xl2tpd/* %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd %dir %{_localstatedir}/run/xl2tpd %files -n xl2tpd-doc %defattr(-,root,root) %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_mandir}/*/* %changelog ++++++ Makefile.patch ++++++ --- Makefile.orig 2010-03-11 12:36:18.000000000 +0100 +++ Makefile 2010-03-11 13:14:42.000000000 +0100 @@ -47,13 +47,13 @@ # trust pppd. This work around will be removed in the near future. # DFLAGS= -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH -DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE +#DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE # Uncomment the next line for Linux. KERNELSRC is needed for if_pppol2tp.h, # but we use a local copy if we don't find it. # -#KERNELSRC=/lib/modules/`uname -r`/build/ -KERNELSRC?=./linux +KERNELSRC=/lib/modules/`uname -r`/build/ +#KERNELSRC?=./linux OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ # # Uncomment the following to use the kernel interface under Linux @@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include # are packages seperately (eg kernel-headers on Fedora) # Note: 2.6.23+ support still needs some changes in the xl2tpd source # -#OSFLAGS+= -DUSE_KERNEL +OSFLAGS+= -DUSE_KERNEL # # # Uncomment the next line for FreeBSD @@ -97,7 +97,7 @@ SRCS=${OBJS:.o=.c} ${HDRS} #LIBS= $(OSLIBS) # -lefence # efence for malloc checking EXEC=xl2tpd -PREFIX?=/usr/local +PREFIX?=/usr SBINDIR?=$(DESTDIR)${PREFIX}/sbin BINDIR?=$(DESTDIR)${PREFIX}/bin MANDIR?=$(DESTDIR)${PREFIX}/share/man @@ -113,7 +113,7 @@ $(EXEC): $(OBJS) $(HDRS) pfc: $(CC) $(CFLAGS) -c contrib/pfc.c - $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o + $(CC) $(LDFLAGS) $(LDLIBS) -o pfc pfc.o -lpcap romfs: $(ROMFSINST) /bin/$(EXEC) ++++++ xl2tpd.init.patch ++++++ --- packaging/suse/xl2tpd.init.orig 2010-03-11 20:54:49.000000000 +0100 +++ packaging/suse/xl2tpd.init 2010-03-11 21:08:28.000000000 +0100 @@ -17,8 +17,10 @@ # ### BEGIN INIT INFO # Provides: xl2tpd -# Required-Start: $syslog -# Required-Stop: $syslog +# Required-Start: $remote_fs $syslog $network +# Required-Stop: $remote_fs $syslog $network +# Should-Start: ypbind +# Should-Stop: ypbind # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start xl2tpd (to provide L2TP VPN's) @@ -30,19 +32,10 @@ # not real dependencies. Depencies have to be handled by admin # resp. the configuration tools (s)he uses. -# Source SuSE config (if still necessary, most info has been moved) -test -r /etc/rc.config && . /etc/rc.config - # Check for missing binaries (stale symlinks should not happen) XL2TPD_BIN=/usr/sbin/xl2tpd -test -x $YPBIND_BIN || { echo "$YPBIND_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } - -# Check for existence of needed config file and read it -#XL2TPD_CONFIG=/etc/sysconfig/xl2tpd -#test -r $YPBIND_CONFIG || { echo "$YPBIND_CONFIG not existing"; -# if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } -#. $XL2TPD_CONFIG +XL2TPD_PID=/var/run/xl2tpd/xl2tpd.pid +XL2TPD_CONF=/etc/xl2tpd/xl2tpd.conf # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -82,7 +75,7 @@ # NOTE: startproc returns 0, even if service is # already running to match LSB spec. - startproc $XL2TPD_BIN >/dev/null 2>&1 + startproc -p $XL2TPD_PID $XL2TPD_BIN # Remember status and be verbose rc_status -v @@ -92,8 +85,7 @@ ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. - killproc -TERM $XL2TPD_BIN - rm -f /var/run/xl2tpd/xl2tpd.pid + killproc -G -TERM $XL2TPD_BIN # Remember status and be verbose rc_status -v ;; @@ -123,13 +115,8 @@ ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service xl2tpd" - ## if it supports it: killproc -HUP $XL2TPD_BIN - #touch /var/run/xl2tpd/xl2tpd.pid rc_status -v - ## Otherwise: - #$0 stop && $0 start - #rc_status ;; reload) ## Like force-reload, but if daemon does not support @@ -137,7 +124,6 @@ # If it supports signalling: echo -n "Reload service xl2tpd" killproc -HUP $XL2TPD_BIN - #touch /var/run/xl2tpd.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 @@ -162,7 +148,7 @@ ## Optional: Probe for the necessity of a reload, ## print out the argument which is required for a reload. - test /etc/xl2tpd/xl2tpd.conf -nt /var/run/xltpd/xl2tpd.pid && echo reload + test $XL2TPD_CONF -nt $XL2TPD_PID && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bytelist for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package bytelist for openSUSE:Factory checked in at Sun Apr 25 18:53:43 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/bytelist/bytelist.changes 2010-04-25 18:53:24.998821000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Apr 25 18:53:16 CEST 2010 - mvyskocil(a)suse.de + +- create package + calling whatdependson for head-i586 New: ---- bytelist.changes bytelist.spec jruby-bytelist-61655c8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bytelist.spec ++++++ # # spec file for package bytelist (Version 1.0.3) # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global git_commit 61655c8 %global cluster jruby # Prevent brp-java-repack-jars from being run. %define __jar_repack %{nil} Name: bytelist Version: 1.0.3 Release: 1 Summary: A java library for lists of bytes Group: Development/Libraries/Java License: CPL or GPLv2+ or LGPLv2+ Url: http://github.com/%{cluster}/%{name} Source0: %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant BuildRequires: ant-junit BuildRequires: java-devel BuildRequires: jcodings BuildRequires: jpackage-utils BuildRequires: junit Requires: java Requires: jcodings Requires: jpackage-utils %description A small java library for manipulating lists of bytes. %prep %setup -q -n %{cluster}-%{name}-%{git_commit} find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; %build echo "See %{url} for more info about the %{name} project." > README.txt export CLASSPATH=$(build-classpath junit jcodings) %__mkdir_p lib %ant %install %__rm -rf %{buildroot} %__mkdir_p %{buildroot}%{_javadir} %__cp -p lib/%{name}-1.0.1.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir}/ %__ln_s %{name}-%{version}.jar %{name}.jar popd %check export CLASSPATH=$(build-classpath junit jcodings) %ant test %clean %__rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/* %doc README.txt %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 handedict for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package handedict for openSUSE:Factory checked in at Sun Apr 25 18:52:58 CEST 2010. -------- --- handedict/handedict.changes 2009-03-18 15:05:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/handedict/handedict.changes 2010-02-02 07:59:42.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 2 06:55:26 UTC 2010 - lzwang(a)novell.com + +- update to 20100210. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ handedict.spec ++++++ --- /var/tmp/diff_new_pack.mEC3U9/_old 2010-04-25 18:52:31.000000000 +0200 +++ /var/tmp/diff_new_pack.mEC3U9/_new 2010-04-25 18:52:31.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Provides: locale(gjiten:zh) Version: 20090318 -Release: 1 +Release: 2 Url: http://chdw.de/dl # original archive is at http://www.chinaboard.de/handedict/handedict_uv-20060906.tar.bz2 # repackaged here to save space in the source rpm ++++++ handedict_uv.u8.bz2 ++++++ Files handedict/handedict_uv.u8.bz2 and /mounts/work_src_done/STABLE/handedict/handedict_uv.u8.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hugin for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at Sun Apr 25 18:52:21 CEST 2010. -------- --- hugin/hugin.changes 2010-04-08 13:16:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/hugin/hugin.changes 2010-04-20 11:14:35.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 10:13:59 CEST 2010 - davejplater(a)gmail.com + +- Change build requirement from fftw to fftw3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.uIxzlN/_old 2010-04-25 18:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.uIxzlN/_new 2010-04-25 18:52:08.000000000 +0200 @@ -19,7 +19,7 @@ Name: hugin -BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel libxml2 python-wxGTK update-desktop-files vigra wxGTK-devel zip +BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel libxml2 python-wxGTK update-desktop-files vigra wxGTK-devel zip %if %suse_version > 1020 BuildRequires: fdupes licenses Requires: licenses @@ -28,7 +28,7 @@ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2010.0.0 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jvyamlb for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package jvyamlb for openSUSE:Factory checked in at Sun Apr 25 18:52:16 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/jvyamlb/jvyamlb.changes 2010-03-23 16:23:16.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Mar 23 11:20:58 UTC 2010 - mvyskocil(a)suse.cz + +- Initial SUSE packaging + jvyamlb-0.2.5-4.fc13.src.rpm + calling whatdependson for head-i586 New: ---- jvyamlb.changes jvyamlb.spec olabini-jvyamlb-e0fdedc.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jvyamlb.spec ++++++ # # spec file for package jvyamlb (Version 0.2.5) # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global git_commit e0fdedc %global cluster olabini # Prevent brp-java-repack-jars from being run. %define __jar_repack %{nil} Name: jvyamlb Version: 0.2.5 Release: 1 Summary: YAML processor for JRuby Group: Development/Libraries/Java License: MIT Url: http://github.com/%{cluster}/%{name} Source0: %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant BuildRequires: ant-junit BuildRequires: bytelist BuildRequires: java-devel BuildRequires: jcodings BuildRequires: joda-time BuildRequires: jpackage-utils BuildRequires: junit Requires: bytelist Requires: java Requires: jcodings Requires: joda-time Requires: jpackage-utils %description YAML processor extracted from JRuby. %prep %setup -q -n %{cluster}-%{name}-%{git_commit} find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; build-jar-repository -s -p lib joda-time bytelist jcodings %build %ant %install %__rm -rf %{buildroot} %__mkdir_p %{buildroot}%{_javadir} %__cp -p lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar pushd %{buildroot}%{_javadir}/ %__ln_s %{name}-%{version}.jar %{name}.jar popd %check %ant test %clean %__rm -rf %{buildroot} %files %defattr(644,root,root,755) %{_javadir}/* %doc LICENSE README CREDITS %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 krusader for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package krusader for openSUSE:Factory checked in at Sun Apr 25 18:51:52 CEST 2010. -------- --- KDE/krusader/krusader.changes 2010-04-19 11:33:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/krusader/krusader.changes 2010-04-19 20:19:54.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 19 18:19:51 UTC 2010 - javier(a)opensuse.org + +- added pt and pt_BR translations for the browse iso service + menu + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krusader.spec ++++++ --- /var/tmp/diff_new_pack.ZOCsez/_old 2010-04-25 18:51:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ZOCsez/_new 2010-04-25 18:51:31.000000000 +0200 @@ -21,7 +21,7 @@ Name: krusader Version: 2.0.0 -Release: 6 +Release: 7 License: GPLv2+ Group: Productivity/File utilities Url: http://krusader.sourceforge.net/ ++++++ krusader_browse_iso.desktop ++++++ --- /var/tmp/diff_new_pack.ZOCsez/_old 2010-04-25 18:51:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ZOCsez/_new 2010-04-25 18:51:31.000000000 +0200 @@ -18,6 +18,8 @@ Name[lv]=Pārlūkot ISO Name[nb]=Bla gjennom ISO Name[nl]=Blader door de ISO +Name[pt]=Examinar ISO +Name[pt_BR]=Explorar ISO Name[ru]=Просмотр содержимого ISO Name[sk]=Prehliadať ISO Name[uk]=Перегляд ISO-штампа ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ladspa for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package ladspa for openSUSE:Factory checked in at Sun Apr 25 18:51:43 CEST 2010. -------- --- ladspa/ladspa.changes 2010-04-14 11:49:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/ladspa/ladspa.changes 2010-04-22 19:17:11.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 22 11:50:49 UTC 2010 - davejplater(a)gmail.com + +- Added obsoletes and provides for all conflicting packman plugins. +- Changed group to more suitable one. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladspa-devel.spec ++++++ --- /var/tmp/diff_new_pack.0FhesN/_old 2010-04-25 18:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0FhesN/_new 2010-04-25 18:51:12.000000000 +0200 @@ -21,7 +21,7 @@ Name: ladspa-devel Summary: Include Files mandatory for Development Version: 1.13 -Release: 2 +Release: 3 License: LGPLv2.1+ Group: Development/Libraries/C and C++ Source: ladspa_sdk_1.13.tar.bz2 ++++++ ladspa.spec ++++++ --- /var/tmp/diff_new_pack.0FhesN/_old 2010-04-25 18:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0FhesN/_new 2010-04-25 18:51:12.000000000 +0200 @@ -38,12 +38,22 @@ %define vocoder_version 0.3 Summary: The Linux Audio Developer's Simple Plug-In API Version: 1.13 -Release: 2 +Release: 3 License: LGPLv2.1+ -Group: Development/Libraries/C and C++ +Group: Productivity/Multimedia/Sound/Utilities AutoReq: on Autoprov: off Provides: ladspa > 1.12.code10.3.1 +Provides: ladspa-swh-plugins = %{swh_version} ladspa-AMB = %{AMB_version} ladspa-FIL = %{FIL_version} +Provides: ladspa-REV = %{REV_version} ladspa-VCO = %{VCO_version} ladspa-alienwah = %{alienwah_version} +Provides: ladspa-caps = %{caps_version} ladspa-pvoc = %{pvoc_version} ladspa-tap-plugins = %{tap_version} +Provides: ladspa-vlevel = %{vlevel_version} ladspa-vocoder = %{vocoder_version} ladspa-blop = %{blop_version} +Provides: ladspa-vcf = %{vcf_version} ladspa-MCP = %{MCP_version} +Obsoletes: ladspa-swh-plugins <= %{swh_version} ladspa-AMB <= %{AMB_version} ladspa-FIL <= %{FIL_version} +Obsoletes: ladspa-REV <= %{REV_version} ladspa-VCO <= %{VCO_version} ladspa-alienwah <= %{alienwah_version} +Obsoletes: ladspa-caps <= %{caps_version} ladspa-pvoc <= %{pvoc_version} ladspa-tap-plugins <= %{tap_version} +Obsoletes: ladspa-vlevel <= %{vlevel_version} ladspa-vocoder <= %{vocoder_version} ladspa-blop <= %{blop_version} +Obsoletes: ladspa-vcf <= %{vcf_version} ladspa-MCP <= %{MCP_version} Source1: ladspa_sdk_1.13.tar.bz2 Source2: cmt_src_1.15.tar.bz2 Source3: swh-plugins-%{swh_version}.tar.bz2 @@ -89,7 +99,7 @@ Patch18: sooperlooper-0.93-gcc4-fix.diff Patch20: swh-libblo.dif # swh-configure.patch changes for >= autoconf-2.65 in openSUSE 11.3 -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 Patch21: swh-configure.patch %else Patch21: swh-configure-2.65.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 libvdpau for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package libvdpau for openSUSE:Factory checked in at Sun Apr 25 18:51:17 CEST 2010. -------- --- libvdpau/libvdpau.changes 2010-04-24 10:40:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/libvdpau/libvdpau.changes 2010-04-24 13:21:22.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 24 12:59:42 CEST 2010 - sndirsch(a)suse.de + +- fixed libvdpau_trace1 package description +- added README for tracing VDPAU function calls + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- README ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvdpau.spec ++++++ --- /var/tmp/diff_new_pack.Xbh8i3/_old 2010-04-25 18:51:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Xbh8i3/_new 2010-04-25 18:51:03.000000000 +0200 @@ -19,13 +19,14 @@ Name: libvdpau Version: 0.4 -Release: 3 +Release: 4 License: MIT License (or similar) Summary: VDPAU wrapper and trace libraries Url: http://people.freedesktop.org/~aplattner Group: System/Libraries Source: %{name}-%{version}.tar.gz Source1: vdpauinfo-0.0.6.tar.gz +Source2: README Source99: baselibs.conf BuildRequires: gcc-c++ pkgconfig xorg-x11-devel BuildRequires: doxygen graphviz texlive @@ -72,9 +73,8 @@ Obsoletes: libvdpau_trace < %{version}-%{release} %description -n libvdpau_trace1 -This package provides a fallback, fake VDPAU implementation for runtime, which -is used when no proper VDPAU implementation library is available (such as -libvdpau_nvidia.so) +This package provides the library for tracing VDPAU function calls. +Its usage is documented in the README. %prep %setup -q -b1 @@ -96,6 +96,7 @@ make %{?jobs:-j%jobs} %makeinstall popd +cp $RPM_SOURCE_DIR/README . %post -n libvdpau1 -p /sbin/ldconfig @@ -117,6 +118,7 @@ %files -n libvdpau_trace1 %defattr(-,root,root) +%doc README %{_libdir}/vdpau/libvdpau_trace.so.* %changelog ++++++ README ++++++ DEBUGGING AND TRACING The VDPAU wrapper library supports tracing VDPAU function calls, and their parameters. This tracing is controlled by the following environment variables: VDPAU_TRACE Enables tracing. Set to 1 to trace function calls. Set to 2 to trace all arguments passed to the function. VDPAU_TRACE_FILE Filename to write traces to. By default, traces are sent to stderr. This variable may either contain a plain filename, or a reference to an existing open file-descriptor in the format "&N" where N is the file descriptor number. The VDPAU wrapper library is responsible for determining which vendor-specific driver to load for a given X11 display/screen. At present, it hard-codes "nvidia" as the driver. The environment variable VDPAU_DRIVER may be set to override this default. The actual library loaded will be libvdpau_${VDPAU_DRIVER}.so. Setting VDPAU_DRIVER to "trace" is not advised. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lockdev for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '10

25 Apr '10

Hello community, here is the log from the commit of package lockdev for openSUSE:Factory checked in at Sun Apr 25 18:50:59 CEST 2010. -------- --- lockdev/lockdev.changes 2010-03-15 11:47:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/lockdev/lockdev.changes 2010-04-23 11:39:13.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 09:38:11 UTC 2010 - lnussel(a)suse.de + +- remove baudboy.h +- fix potential buffer overflow (bnc#588325) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lockdev-drop-baudboy.h.diff lockdev-fix-implicit-declarations.diff lockdev-reserve-some-space-to-avoid-buffer-overflow.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lockdev.spec ++++++ --- /var/tmp/diff_new_pack.sWTdqh/_old 2010-04-25 18:50:45.000000000 +0200 +++ /var/tmp/diff_new_pack.sWTdqh/_new 2010-04-25 18:50:45.000000000 +0200 @@ -21,12 +21,15 @@ Name: lockdev Summary: A library for locking devices Version: 1.0.3_git201003141408 -Release: 1 +Release: 2 License: LGPLv2 Group: System/Base Url: http://packages.debian.org/unstable/source/lockdev #Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.ta… Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}-%{version}.tar.bz2 +Patch0: lockdev-drop-baudboy.h.diff +Patch1: lockdev-fix-implicit-declarations.diff +Patch2: lockdev-reserve-some-space-to-avoid-buffer-overflow.diff # Requires(pre): pwdutils permissions BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +67,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build cat > VERSION <<EOF ++++++ lockdev-drop-baudboy.h.diff ++++++ >From 150afc7a1ea6318a0bb411d47944bbd62f13c6cb Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Wed, 21 Apr 2010 11:41:25 +0200 Subject: [PATCH 2/2] drop baudboy.h whether or not a helper is needed to lock devices needs to be defined by the distribution at build time. It's transparent to applications that use the ttylock interface. --- configure.ac | 15 +++++++++++++++ src/Makefile.am | 2 +- src/baudboy.h | 42 ------------------------------------------ src/baudboy_test.c | 1 - src/lockdev.c | 25 ++++++++----------------- 5 files changed, 24 insertions(+), 61 deletions(-) delete mode 100644 src/baudboy.h diff --git a/configure.ac b/configure.ac index 533e228..b0f0608 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,21 @@ AC_HEADER_STDC LT_INIT([disable-static]) +AC_MSG_CHECKING([whether the library needs to call a helper]) +AC_ARG_ENABLE(helper,AS_HELP_STRING([--enable-helper],[use helper binary for locking]),,enable_helper=auto) +if test x$enable_helper = xauto; then + varlockperms=`stat -c %a /var/lock` + if test x"$varlockperms" != x777; then + enable_helper=yes + fi +fi +if test x$enable_helper = xyes; then + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([TTYLOCK_USE_HELPER], 1, [set to 1 to enable use of helper binary]) +else + AC_MSG_RESULT([no]) +fi + dnl check if user wants debug AC_MSG_CHECKING([whether to enable debug output]) AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[turn on debugging code]),,enable_debug=no) diff --git a/src/Makefile.am b/src/Makefile.am index a5b31e3..85aa3a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ sbin_PROGRAMS = lockdev noinst_PROGRAMS = baudboy -include_HEADERS = lockdev.h baudboy.h ttylock.h +include_HEADERS = lockdev.h ttylock.h AM_CPPFLAGS = -include $(top_builddir)/config.h -DSBINDIR=\"$(sbindir)\" diff --git a/src/baudboy.h b/src/baudboy.h deleted file mode 100644 index 6e41afd..0000000 --- a/src/baudboy.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2001 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - as published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - It 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 Lesser General - Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - - -#ifndef _BAUDBOY_H_ -#define _BAUDBOY_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -int ttylock_helper (const char * devname); -int ttywait_helper (const char * devname); -int ttyunlock_helper (const char * devname); -int ttylocked_helper (const char * devname); - -#ifndef _LIBLOCKDEV_NO_BAUDBOY_DEFINES -#define ttylock(devname) ttylock_helper(devname) -#define ttywait(devname) ttywait_helper(devname) -#define ttyunlock(devname) ttyunlock_helper(devname) -#define ttylocked(devname) ttylocked_helper(devname) -#endif - -#ifdef __cplusplus -}; -#endif - -#endif /* _BAUDBOY_H_ */ diff --git a/src/baudboy_test.c b/src/baudboy_test.c index 768e260..e481270 100644 --- a/src/baudboy_test.c +++ b/src/baudboy_test.c @@ -8,7 +8,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#include "baudboy.h" void usage (void) diff --git a/src/lockdev.c b/src/lockdev.c index 8bcf8c6..88305e9 100644 --- a/src/lockdev.c +++ b/src/lockdev.c @@ -120,8 +120,6 @@ #include <sys/wait.h> #include "lockdev.h" #include "ttylock.h" -#define _LIBLOCKDEV_NO_BAUDBOY_DEFINES -#include "baudboy.h" #define LOCKDEV_PATH SBINDIR "/lockdev" @@ -906,6 +904,7 @@ dev_unlock (const char *devname, } +#ifndef TTYLOCK_USE_HELPER int ttylock(const char *devname) { @@ -925,16 +924,7 @@ ttylocked(const char *devname) return dev_testlock( devname) == 0 ? 0 : -1; } -int -ttywait (const char *devname) -{ - - int rc; - while((rc = ttylocked(devname)) == 0) - sleep(1); - return rc; -} - +#else static int _spawn_helper(const char * argv[]) { pid_t child; @@ -1003,7 +993,7 @@ static int _spawn_helper(const char * argv[]) } int -ttylock_helper(const char * devname) +ttylock(const char * devname) { const char * argv[] = { LOCKDEV_PATH, "-l", NULL, NULL}; argv[2] = devname; @@ -1011,7 +1001,7 @@ ttylock_helper(const char * devname) } int -ttyunlock_helper(const char * devname) +ttyunlock(const char * devname) { const char * argv[] = { LOCKDEV_PATH, "-u", NULL, NULL}; argv[2] = devname; @@ -1019,18 +1009,19 @@ ttyunlock_helper(const char * devname) } int -ttylocked_helper(const char * devname) +ttylocked(const char * devname) { const char * argv[] = { LOCKDEV_PATH, NULL, NULL}; argv[1] = devname; return _spawn_helper(argv); } +#endif int -ttywait_helper(const char * devname) +ttywait(const char * devname) { int rc; - while((rc = ttylocked_helper(devname)) == 0) + while((rc = ttylocked(devname)) == 0) sleep(1); return rc; } -- 1.6.4.2 ++++++ lockdev-fix-implicit-declarations.diff ++++++ >From 720422dd2fd0080ecd9c32cdbe1068c0649f632a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Fri, 23 Apr 2010 10:57:00 +0200 Subject: [PATCH] fix implicit declarations --- src/baudboy_test.c | 1 + src/sample.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/baudboy_test.c b/src/baudboy_test.c index e481270..afecb15 100644 --- a/src/baudboy_test.c +++ b/src/baudboy_test.c @@ -8,6 +8,7 @@ #include <unistd.h> #include <errno.h> #include <string.h> +#include <ttylock.h> void usage (void) diff --git a/src/sample.c b/src/sample.c index a2c1f45..3726ae5 100644 --- a/src/sample.c +++ b/src/sample.c @@ -1,7 +1,9 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#include <fcntl.h> #include "lockdev.h" void -- 1.6.4.2 ++++++ lockdev-reserve-some-space-to-avoid-buffer-overflow.diff ++++++ >From 7e31caa61b5f839e7b2c3f4c45dcbba925f37d32 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Fri, 23 Apr 2010 11:09:29 +0200 Subject: [PATCH 2/2] reserve some space to avoid buffer overflow this should really be handled by the _dl_filename_* functions --- src/lockdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lockdev.c b/src/lockdev.c index 88305e9..84c0902 100644 --- a/src/lockdev.c +++ b/src/lockdev.c @@ -488,7 +488,7 @@ _dl_check_devname (const char *devname) } if ( strcmp( p, "tty") == 0 ) p = ttyname( 0); /* this terminal, if it exists */ - if (((l = strlen(p)) == 0) || (l > (MAXPATHLEN - strlen(LOCK_PATH)))) + if (((l = strlen(p)) == 0) || (l > (MAXPATHLEN - strlen(LOCK_PATH) - 10))) return NULL; if ((m = malloc(++l)) == NULL) return NULL; -- 1.6.4.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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