May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit nagios
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package nagios checked in at Thu May 25 00:48:20 CEST 2006. -------- --- nagios/nagios.changes 2006-05-03 22:52:06.000000000 +0200 +++ nagios/nagios.changes 2006-05-24 18:39:08.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 24 18:33:07 CEST 2006 - schwab(a)suse.de + +- Don't build as root. +- Don't strip binaries. +- Fix format string bug. + +------------------------------------------------------------------- New: ---- format-string.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.cXFgUj/_old 2006-05-25 00:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.cXFgUj/_new 2006-05-25 00:47:48.000000000 +0200 @@ -8,12 +8,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: nagios BuildRequires: apache2-devel freetype2-devel gd-devel iputils libapr-util1-devel libjpeg-devel libpng-devel mailx pcre-devel xorg-x11-devel Summary: The Nagios Network Monitor Version: 1.3 -Release: 14 +Release: 16 URL: http://www.nagios.org/ License: GPL Group: System/Monitoring @@ -25,13 +26,14 @@ Patch2: nagios-perl58.dif Patch3: size.patch Patch4: content_length.patch +Patch5: format-string.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nsusr daemon %define nsgrp daemon %define cmdusr nobody %define cmdgrp www -%define apxs2 apxs2-prefork +%define apxs2 /usr/sbin/apxs2-prefork %define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR) %description @@ -62,6 +64,7 @@ %endif %patch3 %patch4 +%patch5 %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ @@ -93,27 +96,24 @@ make) %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/nagios install -d -m 0755 ${RPM_BUILD_ROOT}%{_prefix}/include/nagios install -d -m 0755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 0755 ${RPM_BUILD_ROOT}/%{apache2_sysconfdir}/conf.d/ install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d/ -make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" install +make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= STRIP=: install #make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" install-commandmode #make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit -make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" CGICFGDIR=/etc/nagios install-config +make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= CGICFGDIR=/etc/nagios install-config for i in $RPM_BUILD_ROOT/etc/nagios/*-sample ; do mv $i ${i%%-sample} done -chown root:%{nsgrp} $RPM_BUILD_ROOT/etc/nagios/resource.cfg -chmod 0640 $RPM_BUILD_ROOT/etc/nagios/resource.cfg cp -vf sample-config/template-object/minimal.cfg \ $RPM_BUILD_ROOT/etc/nagios/minimal.cfg-sample # devel install -m 0644 common/locations.h ${RPM_BUILD_ROOT}%{_prefix}/include/nagios # -cd contrib; make INSTALL=install CGIDIR=${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi install +cd contrib; make INSTALL=install CGIDIR=${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi INSTALL_OPTS= install install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/nagios/plugins # install SuSE specials cp %{SOURCE3} $RPM_BUILD_ROOT/%{apache2_sysconfdir}/conf.d/nagios.conf @@ -150,9 +150,10 @@ %dir /etc/nagios %dir %{_prefix}/include/nagios %{_prefix}/sbin/nagios -%defattr(-,root,-) +%defattr(-,root,root) %{_prefix}/include/nagios/locations.h -%config(noreplace) /etc/nagios/* +%config(noreplace) /etc/nagios/[!r]* +%attr(640,root,%nsgrp) %config(noreplace) /etc/nagios/resource.cfg %config /etc/logrotate.d/nagios %doc Changelog LICENSE README* UPGRADING @@ -167,6 +168,10 @@ %config(noreplace) %{apache2_sysconfdir}/conf.d/* %changelog -n nagios +* Wed May 24 2006 - schwab(a)suse.de +- Don't build as root. +- Don't strip binaries. +- Fix format string bug. * Wed May 03 2006 - stark(a)suse.de - fixed possible buffer overflow in CGI scripts (#140494) (CVE-2006-2162) ++++++ format-string.patch ++++++ --- cgi/sap_log.c +++ cgi/sap_log.c @@ -183,7 +183,7 @@ display_info_table("View SAP-Logs",TRUE,&current_authdata); printf("<div ALIGN=CENTER CLASS='statusTitle'>View SAP-Logfiles</div>\n"); - printf("<br><br><center><table border = 0 width=90%>\n"); + printf("<br><br><center><table border = 0 width=90%%>\n"); printf("<tr><th CLASS='status'>System</th><th CLASS='status'>Appl.Server</th><th CLASS='status'>Sys.Nr</th><th CLASS='status'>Date</th></tr>"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mrtg
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package mrtg checked in at Thu May 25 00:47:49 CEST 2006. -------- --- mrtg/mrtg.changes 2006-01-25 21:38:26.000000000 +0100 +++ mrtg/mrtg.changes 2006-05-24 11:18:38.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 11:15:30 CEST 2006 - anicka(a)suse.cz + +- update to 2.14.3 + - many small fixes and improvements + +------------------------------------------------------------------- Old: ---- mrtg-2.12.2-icons.diff mrtg-2.12.2.tar.gz mrtg-2.12.2.tar.gz.md5 mrtg-2.12.2.tar.gz.md5.pgp New: ---- mrtg-2.14.3-icons.diff mrtg-2.14.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrtg.spec ++++++ --- /var/tmp/diff_new_pack.zSyjjH/_old 2006-05-25 00:47:44.000000000 +0200 +++ /var/tmp/diff_new_pack.zSyjjH/_new 2006-05-25 00:47:44.000000000 +0200 @@ -1,35 +1,31 @@ # -# spec file for package mrtg (Version 2.12.2) +# spec file for package mrtg (Version 2.14.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: mrtg BuildRequires: gd-devel libjpeg-devel libpng-devel xorg-x11 xorg-x11-devel -Version: 2.12.2 +Version: 2.14.3 Release: 1 Requires: perl = %{perl_version} Autoreqprov: on Group: Productivity/Networking/Diagnostic License: GPL URL: http://www.mrtg.org -Summary: The Multi Router Traffic Grapher -Source: %{name}-%{version}.tar.gz -Source1: %{name}-%{version}.tar.gz.md5 -Source2: %{name}-%{version}.tar.gz.md5.pgp +Summary: The Multirouter Traffic Grapher +Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-icons.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The Multi Router Traffic Grapher - -A tool to visualise network traffic via a web page. +A tool to visualize network traffic via a Web page. @@ -65,7 +61,6 @@ install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{iconsdir} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/apache2/icons install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{_datadir}/apache2/icons -chmod 644 doc/*.html doc/*.wml rm -rf $RPM_BUILD_ROOT/usr/share/doc rm -rf $RPM_BUILD_ROOT/usr/share/mrtg2 @@ -74,7 +69,7 @@ %files %defattr(-, root, root) -%doc CHANGES COPYING COPYRIGHT README THANKS contrib doc/*.{pod,html,wml,txt,png} +%doc CHANGES COPYING COPYRIGHT README THANKS contrib doc/*.{pod,txt,png} %doc %{_mandir}/man?/* %{_bindir}/* %{iconsdir} @@ -82,6 +77,9 @@ %{_datadir}/apache2 %changelog -n mrtg +* Wed May 24 2006 - anicka(a)suse.cz +- update to 2.14.3 +- many small fixes and improvements * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jul 13 2005 - mjancar(a)suse.cz ++++++ mrtg-2.12.2-icons.diff -> mrtg-2.14.3-icons.diff ++++++ --- mrtg/mrtg-2.12.2-icons.diff 2005-07-13 18:24:02.000000000 +0200 +++ mrtg/mrtg-2.14.3-icons.diff 2006-05-24 10:59:29.000000000 +0200 @@ -1,18 +1,18 @@ --- bin/indexmaker +++ bin/indexmaker -@@ -485,7 +485,8 @@ - #lets make sure there is a trailing path separator - $gifPath =~ s|/*$|/|; - } else { -- $gifPath = "$$cfg{imagehtml}"; -+# $gifPath = "$$cfg{imagehtml}"; -+ $gifPath = "/icons/" - } +@@ -281,7 +281,8 @@ + #lets make sure there is a trailing path separator + $gifPath =~ s|/*$|/|; + } else { +- $gifPath = "$$cfg{imagehtml}"; ++ # $gifPath = "$$cfg{imagehtml}"; ++ $gifPath = "/icons/" + } + - my $VERSION = "2.12.2"; --- bin/mrtg +++ bin/mrtg -@@ -1517,7 +1517,8 @@ +@@ -1625,7 +1625,8 @@ #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mkvtoolnix
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package mkvtoolnix checked in at Thu May 25 00:47:37 CEST 2006. -------- --- mkvtoolnix/mkvtoolnix.changes 2006-01-25 21:38:20.000000000 +0100 +++ mkvtoolnix/mkvtoolnix.changes 2006-05-24 21:40:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 21:40:52 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.gbsSZM/_old 2006-05-25 00:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.gbsSZM/_new 2006-05-25 00:47:31.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package mkvtoolnix (Version 1.6.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,22 +13,22 @@ BuildRequires: flac-devel gcc-c++ gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libmatroska libtiff-devel libvorbis-devel libwnck-devel lzo-devel mDNSResponder-devel update-desktop-files wxGTK-devel URL: http://www.bunkus.org/videotools/mkvtoolnix/ Version: 1.6.5 -Release: 1 -Summary: tools to create, alter and inspect Matroska files +Release: 14 +Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL Group: Productivity/Multimedia/Other Source: %{name}-%{version}.tar.bz2 Source2: README.SUSE Patch: mmg-rename.diff -Summary: tools to create, alter and inspect Matroska files +Summary: Tools to Create, Alter, and Inspect Matroska Files BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr %description Tools to create and manipulate Matroska files (extensions .mkv and .mka), a new container format for audio and video files. Includes -command line tools mkvextract, mkvinfo, mkvmerge and a graphical -frontend for them, mkvmerge-gui. +command line tools mkvextract, mkvinfo, mkvmerge, and a graphical +front-end for them, mkvmerge-gui. @@ -37,7 +37,6 @@ Moritz Bunkus <moritz(a)bunkus.org> %prep -rm -rf $RPM_BUILD_ROOT %setup %patch -p1 cp %{S:2} . @@ -49,7 +48,7 @@ make %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT STRIP=: install -m 0644 README.SUSE AUTHORS ChangeLog COPYING README \ $RPM_BUILD_ROOT%{_docdir}/%{name} rm $RPM_BUILD_ROOT%{_docdir}/%{name}/mkvmerge-gui.1 @@ -76,10 +75,11 @@ /usr/share/man/man1/mkvmerge.1.gz /usr/share/man/man1/mkvmerge-gui.1.gz %doc /usr/share/doc/packages/mkvtoolnix -%doc /usr/share/doc/packages/mkvtoolnix/* #%doc README.SUSE AUTHORS ChangeLog COPYING README %changelog -n mkvtoolnix +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Dec 22 2005 - seife(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-ldap-client
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yast2-ldap-client checked in at Thu May 25 00:47:34 CEST 2006. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2006-04-20 16:10:05.000000000 +0200 +++ yast2-ldap-client/yast2-ldap-client.changes 2006-05-24 13:11:58.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 24 12:41:53 CEST 2006 - jsuchome(a)suse.cz + +- do not reinitialize existing connection for browsing LDAP (#178309) +- 2.13.15 + +------------------------------------------------------------------- +Fri May 19 11:33:13 CEST 2006 - ug(a)suse.de + +- fixed desktop file for cloning process (#177082) +- 2.13.14 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-2.13.13.tar.bz2 New: ---- yast2-ldap-client-2.13.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.5Ep91e/_old 2006-05-25 00:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.5Ep91e/_new 2006-05-25 00:47:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.13.13) +# spec file for package yast2-ldap-client (Version 2.13.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ldap-client -Version: 2.13.13 +Version: 2.13.15 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.13.13.tar.bz2 +Source0: yast2-ldap-client-2.13.15.tar.bz2 prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite PreReq: %fillup_prereq @@ -40,7 +40,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-client-2.13.13 +%setup -n yast2-ldap-client-2.13.15 %build %{prefix}/bin/y2tool y2autoconf @@ -79,6 +79,12 @@ /var/adm/fillup-templates/sysconfig.ldap %changelog -n yast2-ldap-client +* Wed May 24 2006 - jsuchome(a)suse.cz +- do not reinitialize existing connection for browsing LDAP (#178309) +- 2.13.15 +* Fri May 19 2006 - ug(a)suse.de +- fixed desktop file for cloning process (#177082) +- 2.13.14 * Thu Apr 20 2006 - jsuchome(a)suse.cz - allow more characters (this time "-") for host name (#167991) - 2.13.13 ++++++ yast2-ldap-client-2.13.13.tar.bz2 -> yast2-ldap-client-2.13.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.13/VERSION new/yast2-ldap-client-2.13.15/VERSION --- old/yast2-ldap-client-2.13.13/VERSION 2006-04-20 15:40:19.000000000 +0200 +++ new/yast2-ldap-client-2.13.15/VERSION 2006-05-24 12:42:55.000000000 +0200 @@ -1 +1 @@ -2.13.13 +2.13.15 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.13/src/ldap.desktop new/yast2-ldap-client-2.13.15/src/ldap.desktop --- old/yast2-ldap-client-2.13.13/src/ldap.desktop 2005-09-08 10:36:27.000000000 +0200 +++ new/yast2-ldap-client-2.13.15/src/ldap.desktop 2006-05-19 13:04:39.000000000 +0200 @@ -16,6 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=ldap X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstRequires=ldap-server Icon=yast-ldap Exec=/sbin/yast2 ldap diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.13/src/ui.ycp new/yast2-ldap-client-2.13.15/src/ui.ycp --- old/yast2-ldap-client-2.13.13/src/ui.ycp 2006-04-20 15:44:22.000000000 +0200 +++ new/yast2-ldap-client-2.13.15/src/ui.ycp 2006-05-24 11:08:41.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: ui.ycp 29583 2006-03-31 13:32:03Z jsuchome $ + * $Id: ui.ycp 30291 2006-04-20 14:12:17Z jsuchome $ * * All user interface functions. */ @@ -312,12 +312,14 @@ } if (result == `fetch) { - string dn = LdapPopup::InitAndBrowseTree ("", $[ - "hostname" : Ldap::GetFirstServer (server), - "port" : Ldap::GetFirstPort (server), - "version" : ldap_v2 ? 2 : 3, - "use_tls" : ldap_tls ? "yes" : "no" - ]); + string dn = Ldap::ldap_initialized ? + LdapPopup::BrowseTree ("") : + LdapPopup::InitAndBrowseTree ("", $[ + "hostname" : Ldap::GetFirstServer (server), + "port" : Ldap::GetFirstPort (server), + "version" : ldap_v2 ? 2 : 3, + "use_tls" : ldap_tls ? "yes" : "no" + ]); if (dn != "") UI::ChangeWidget (`id(`ldapd), `Value, dn); } @@ -764,12 +766,14 @@ // 3. other events if (contains ([`br, `br_passwd, `br_shadow, `br_group ], result)) { - string dn = LdapPopup::InitAndBrowseTree (base_dn, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" - ]); + string dn = Ldap::ldap_initialized ? + LdapPopup::BrowseTree (base_dn) : + LdapPopup::InitAndBrowseTree (base_dn, $[ + "hostname" : Ldap::GetFirstServer (Ldap::server), + "port" : Ldap::GetFirstPort (Ldap::server), + "version" : Ldap::ldap_v2 ? 2 : 3, + "use_tls" : Ldap::ldap_tls ? "yes" : "no" + ]); if (dn != "") { map br2entry = $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mktemp
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package mktemp checked in at Thu May 25 00:47:29 CEST 2006. -------- --- mktemp/mktemp.changes 2006-01-25 21:30:33.000000000 +0100 +++ mktemp/mktemp.changes 2006-05-24 19:44:37.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 19:44:30 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- mktemp-1.5.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mktemp.spec ++++++ --- /var/tmp/diff_new_pack.I4PzYB/_old 2006-05-25 00:47:22.000000000 +0200 +++ /var/tmp/diff_new_pack.I4PzYB/_new 2006-05-25 00:47:22.000000000 +0200 @@ -1,26 +1,26 @@ # # spec file for package mktemp (Version 1.5) # -# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-devel pam-modules patch permissions popt ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils cracklib gcc gdbm gettext libtool perl rpm Name: mktemp License: BSD Group: System/Base Autoreqprov: on -Summary: A utility for tempfiles +Summary: A Utility for Temp Files Version: 1.5 -Release: 648 +Release: 744 BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.mktemp.org Source: ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.5.tar.bz2 +Patch: mktemp-1.5.diff %description mktemp is a small utility that interfaces to the mktemp() function call @@ -34,6 +34,7 @@ %prep %setup -q +%patch %build %{?suse_update_config:%{suse_update_config -f . }} @@ -51,6 +52,8 @@ %{_mandir}/man1/mktemp.1.gz %changelog -n mktemp +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Oct 20 2003 - ro(a)suse.de ++++++ mktemp-1.5.diff ++++++ --- Makefile.in +++ Makefile.in @@ -108,7 +108,7 @@ $(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1 install-binaries: $(PROG) - $(INSTALL) -m 0555 -s $(PROG) $(bindir)/$(PROG) + $(INSTALL) -m 0555 $(PROG) $(bindir)/$(PROG) install-man: $(INSTALL) -m 0444 $(srcdir)/$(PROG).$(mantype) $(mandir)/man1/$(PROG).1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mingetty
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package mingetty checked in at Thu May 25 00:47:25 CEST 2006. -------- --- mingetty/mingetty.changes 2006-01-25 21:30:33.000000000 +0100 +++ mingetty/mingetty.changes 2006-05-24 17:16:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 17:16:26 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingetty.spec ++++++ --- /var/tmp/diff_new_pack.6mPffM/_old 2006-05-25 00:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.6mPffM/_new 2006-05-25 00:47:19.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package mingetty (Version 0.9.6s) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,8 +15,8 @@ Group: System/Base Autoreqprov: on Version: 0.9.6s -Release: 69 -Summary: Minimal getty for virtual consoles only +Release: 88 +Summary: Minimal Getty for Virtual Consoles Only Provides: sysvinit:/sbin/mingetty BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: mingetty-0.9.6s.tar.bz2 @@ -43,7 +43,6 @@ make RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" DEFTERM=linux %install -rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}{/sbin,%{_mandir}/man8} make install MANPATH=%{_mandir} DESTDIR=${RPM_BUILD_ROOT} @@ -53,6 +52,8 @@ %doc %{_mandir}/man8/mingetty.8.gz %changelog -n mingetty +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Mar 30 2004 - werner(a)suse.de ++++++ mingetty-0.9.6s.dif ++++++ --- /var/tmp/diff_new_pack.6mPffM/_old 2006-05-25 00:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.6mPffM/_new 2006-05-25 00:47:19.000000000 +0200 @@ -1,6 +1,6 @@ --- Makefile -+++ Makefile Tue Mar 30 19:12:10 2004 -@@ -3,9 +3,10 @@ ++++ Makefile +@@ -3,19 +3,20 @@ # DEFTERM = linux VERSION = mingetty-0.9.6s @@ -10,21 +10,23 @@ -CFLAGS = -Wall -O2 -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES) +CFLAGS = -Wall $(RPM_OPT_FLAGS) -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES) # - LDFLAGS = -Wl,-warn-common -s +-LDFLAGS = -Wl,-warn-common -s ++LDFLAGS = -Wl,-warn-common CC = gcc -@@ -14,8 +15,8 @@ + + all: mingetty size mingetty install: all - install -s mingetty /sbin/ - install -m 644 mingetty.8 /usr/share/man/man8/ -+ install -s mingetty $(DESTDIR)/sbin/ ++ install mingetty $(DESTDIR)/sbin/ + install -m 644 mingetty.8 $(DESTDIR)$(MANDIR)/man8/ mingetty: mingetty.o sigfholder.o mingetty.o: mingetty.c --- mingetty.c -+++ mingetty.c Tue Mar 30 19:12:36 2004 ++++ mingetty.c @@ -101,6 +101,10 @@ #include <ctype.h> #include <utmp.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yast2-installation checked in at Thu May 25 00:47:19 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-05-23 19:06:47.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-05-24 13:23:29.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 24 12:52:21 CEST 2006 - jsrain(a)suse.cz + +- properly integrate YCP code for add-on product installation in + running system (if YCP code present) (#178311) +- 2.13.113 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.112.tar.bz2 New: ---- yast2-installation-2.13.113.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.hbQrBz/_old 2006-05-25 00:47:06.000000000 +0200 +++ /var/tmp/diff_new_pack.hbQrBz/_new 2006-05-25 00:47:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.112) +# spec file for package yast2-installation (Version 2.13.113) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.112 +Version: 2.13.113 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.112.tar.bz2 +Source0: yast2-installation-2.13.113.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.112 +%setup -n yast2-installation-2.13.113 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,10 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Wed May 24 2006 - jsrain(a)suse.cz +- properly integrate YCP code for add-on product installation in + running system (if YCP code present) (#178311) +- 2.13.113 * Tue May 23 2006 - jdsn(a)suse.de - gray out checkboxes in inst_suse_register when skipping (#178042) - 2.13.112 ++++++ yast2-installation-2.13.112.tar.bz2 -> yast2-installation-2.13.113.tar.bz2 ++++++ ++++ 2235 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.112/VERSION new/yast2-installation-2.13.113/VERSION --- old/yast2-installation-2.13.112/VERSION 2006-05-23 18:58:17.000000000 +0200 +++ new/yast2-installation-2.13.113/VERSION 2006-05-24 13:09:27.000000000 +0200 @@ -1 +1 @@ -2.13.112 +2.13.113 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.112/configure.in new/yast2-installation-2.13.113/configure.in --- old/yast2-installation-2.13.112/configure.in 2006-05-23 19:05:05.000000000 +0200 +++ new/yast2-installation-2.13.113/configure.in 2006-05-24 13:22:05.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.112, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.13.113, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.112" +VERSION="2.13.113" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.112/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.113/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.13.112/src/modules/AddOnProduct.ycp 2006-05-23 18:06:54.000000000 +0200 +++ new/yast2-installation-2.13.113/src/modules/AddOnProduct.ycp 2006-05-24 10:28:42.000000000 +0200 @@ -882,9 +882,12 @@ // Try to extract files from the archive map out = (map)SCR::Execute (.target.bash_output, sformat (" test -d /y2update && rm -rf /y2update; -/bin/mkdir /y2update; -cd /y2update; +/bin/mkdir -p /y2update/all; +cd /y2update/all; /bin/tar -xvf %1; +cd /y2update; +ln -s all/usr/share/YaST2/* .; +ln -s all/usr/lib/YaST2/* .; ", binaries)); // Failed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mgetty
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package mgetty checked in at Thu May 25 00:47:16 CEST 2006. -------- --- mgetty/mgetty.changes 2006-02-27 16:41:00.000000000 +0100 +++ mgetty/mgetty.changes 2006-05-24 17:37:37.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 17:37:26 CEST 2006 - schwab(a)suse.de + +- Don't build as root. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgetty.spec ++++++ --- /var/tmp/diff_new_pack.mvSUhi/_old 2006-05-25 00:46:59.000000000 +0200 +++ /var/tmp/diff_new_pack.mvSUhi/_new 2006-05-25 00:46:59.000000000 +0200 @@ -8,11 +8,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: mgetty BuildRequires: netpbm te_ams te_latex Version: 1.1.33 -Release: 6 +Release: 16 PreReq: %install_info_prereq filesystem Requires: g3utils Autoreqprov: on @@ -139,6 +140,7 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files +%defattr(-, root, root) %dir /etc/mgetty+sendfax %doc %{_docdir}/mgetty %dir /var/spool/voice @@ -215,6 +217,7 @@ %config /usr/lib/mgetty+sendfax/new_fax %files -n g3utils +%defattr(-, root, root) /usr/bin/g32pbm /usr/bin/g3cat /usr/bin/g3topbm @@ -224,12 +227,12 @@ %doc %{_mandir}/man1/pbm2g3.1.gz %files -n sendfax +%defattr(-, root, root) %dir /etc/mgetty+sendfax %dir /usr/lib/mgetty+sendfax -%dir /var/spool/fax +%attr(755,fax,root) %dir /var/spool/fax %dir /var/spool/fax/incoming -#%attr(0755,fax,root) -%verify(not mode) %dir /var/spool/fax/outgoing +%attr(755,fax,root) %verify(not mode) %dir /var/spool/fax/outgoing #%dir /var/spool/fax/outgoing/locks %config(noreplace) /etc/mgetty+sendfax/faxheader %config(noreplace) /etc/mgetty+sendfax/faxrunq.config @@ -243,8 +246,7 @@ /usr/sbin/faxrunqd /usr/sbin/sendfax /usr/lib/mgetty+sendfax/new_fax -#%attr(-,fax,root) -/usr/lib/mgetty+sendfax/faxq-helper +%attr(4711,fax,root) /usr/lib/mgetty+sendfax/faxq-helper /usr/lib/mgetty+sendfax/cour25.pbm /usr/lib/mgetty+sendfax/cour25n.pbm %doc %{_mandir}/man1/fax.1.gz @@ -258,6 +260,9 @@ %doc %{_mandir}/man8/sendfax.8.gz %changelog -n mgetty +* Wed May 24 2006 - schwab(a)suse.de +- Don't build as root. +- Don't strip binaries. * Mon Feb 27 2006 - anicka(a)suse.cz - fix #151487 (printf problem) * Wed Jan 25 2006 - mls(a)suse.de ++++++ mgetty-1.1.33.diff ++++++ --- /var/tmp/diff_new_pack.mvSUhi/_old 2006-05-25 00:46:59.000000000 +0200 +++ /var/tmp/diff_new_pack.mvSUhi/_new 2006-05-25 00:46:59.000000000 +0200 @@ -97,8 +97,8 @@ + -test -d $(DESTDIR)$(SBINDIR) || ( ./mkidirs $(DESTDIR)$(SBINDIR) ; chmod 755 $(DESTDIR)$(SBINDIR) ) + -mv -f $(DESTDIR)$(SBINDIR)/mgetty $(DESTDIR)$(SBINDIR)/mgetty.old + -mv -f $(DESTDIR)$(SBINDIR)/sendfax $(DESTDIR)$(SBINDIR)/sendfax.old -+ $(INSTALL) -s -m 700 mgetty $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -s -m 755 sendfax $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -m 700 mgetty $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -m 755 sendfax $(DESTDIR)$(SBINDIR) # # data files + directories # @@ -121,15 +121,15 @@ + test -d $(DESTDIR)$(CONFDIR) || \ + ( ./mkidirs $(DESTDIR)$(CONFDIR) && chmod 755 $(DESTDIR)$(CONFDIR)) + test -f $(DESTDIR)$(CONFDIR)/login.config || \ -+ $(INSTALL) -o root -m 600 login.config $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 600 login.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/mgetty.config || \ -+ $(INSTALL) -o root -m 600 mgetty.config $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 600 mgetty.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/sendfax.config || \ -+ $(INSTALL) -o root -m 644 sendfax.config $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 644 sendfax.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/dialin.config || \ -+ $(INSTALL) -o root -m 600 dialin.config $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 600 dialin.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/faxrunq.config || \ -+ $(INSTALL) -o root -m 644 faxrunq.config $(DESTDIR)$(CONFDIR)/ ++ $(INSTALL) -m 644 faxrunq.config $(DESTDIR)$(CONFDIR)/ # # test for outdated stuff # @@ -138,7 +138,7 @@ then \ echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\ echo "been changed. Because of this, to avoid confusions, it's called " ;\ -@@ -628,29 +630,29 @@ +@@ -628,29 +630,27 @@ # # fax spool directories # @@ -158,13 +158,11 @@ + ( ./mkidirs $(DESTDIR)$(spool) && chmod 755 $(DESTDIR)$(spool) ) + test -d $(DESTDIR)$(FAX_SPOOL) || \ + ( ./mkidirs $(DESTDIR)$(FAX_SPOOL) && \ -+ chown $(FAX_OUT_USER) $(DESTDIR)$(FAX_SPOOL) && \ + chmod 755 $(DESTDIR)$(FAX_SPOOL) ) + test -d $(DESTDIR)$(FAX_SPOOL_IN) || \ + ( ./mkidirs $(DESTDIR)$(FAX_SPOOL_IN) && chmod 755 $(DESTDIR)$(FAX_SPOOL_IN) ) + test -d $(DESTDIR)$(FAX_SPOOL_OUT) || \ + ./mkidirs $(DESTDIR)$(FAX_SPOOL_OUT) -+ chown $(FAX_OUT_USER) $(DESTDIR)$(FAX_SPOOL_OUT) + chmod 755 $(DESTDIR)$(FAX_SPOOL_OUT) # # g3 tool programs @@ -182,16 +180,16 @@ BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # -@@ -659,7 +661,7 @@ +@@ -659,7 +659,7 @@ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ cd compat ; \ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ -+ $(INSTALL) -s -m 755 mg.echo $(DESTDIR)$(BINDIR) ; \ ++ $(INSTALL) -m 755 mg.echo $(DESTDIR)$(BINDIR) ; \ fi # -@@ -667,19 +669,19 @@ +@@ -667,19 +667,19 @@ # install.doc: cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ @@ -218,7 +216,7 @@ # # voice extensions, consult the `voice' chapter in the documentation # -@@ -688,7 +690,7 @@ +@@ -688,7 +688,7 @@ @$(MAKE) mgetty cd voice; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \ LN="$(LN)" MV="$(MV)" RM="$(RM)" \ @@ -235,8 +233,8 @@ install: all - $(INSTALL) -s -m 700 -o root callback $(SBINDIR) - $(INSTALL) -s -m 4711 -o root ct $(BINDIR) -+ $(INSTALL) -s -m 755 -o root callback $(SBINDIR) -+ $(INSTALL) -s -m 4755 -o root ct $(BINDIR) ++ $(INSTALL) -m 755 callback $(SBINDIR) ++ $(INSTALL) -m 4755 ct $(BINDIR) # source modules --- doc/Makefile @@ -261,7 +259,7 @@ done ; \ --- fax/Makefile +++ fax/Makefile -@@ -55,26 +55,30 @@ +@@ -55,26 +55,29 @@ # # programs / scripts # @@ -278,7 +276,6 @@ - chmod 4711 $(LIBDIR)/faxq-helper + $(INSTALL) -m 755 faxrunqd $(DESTDIR)$(SBINDIR) + $(INSTALL) faxq-helper $(DESTDIR)$(LIBDIR) -+ chown $(FAX_OUT_USER) $(DESTDIR)$(LIBDIR)/faxq-helper + chmod 4711 $(DESTDIR)$(LIBDIR)/faxq-helper # # data files @@ -304,7 +301,7 @@ else \ echo "WARNING: no PBM magic (string P1) found in /etc/magic" ; \ echo " maybe you should append the definitions in \`\`fax/etc-magic''." ; \ -@@ -82,4 +86,4 @@ +@@ -82,4 +85,4 @@ # # faxspool.rules sample file # @@ -317,7 +314,7 @@ # for f in $(G3_PROGRAMS) ; do \ - $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ -+ $(INSTALL) -s -m 755 $$f $(DESTDIR)$(BINDIR) ; \ ++ $(INSTALL) -m 755 $$f $(DESTDIR)$(BINDIR) ; \ done # # make symlink for "g3topbm" (so third-party fax viewers won't fail) @@ -449,12 +446,12 @@ @echo "" - $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) - $(INSTALL) -m 755 vm/vm $(BINDIR) -+ $(INSTALL) -s -m 755 vgetty/vgetty $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -s -m 755 vm/vm $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 vgetty/vgetty $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -m 755 vm/vm $(DESTDIR)$(BINDIR) for i in $(PVFTOOLS); \ do \ - $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ -+ $(INSTALL) -s -m 755 pvftools/$$i $(DESTDIR)$(BINDIR); \ ++ $(INSTALL) -m 755 pvftools/$$i $(DESTDIR)$(BINDIR); \ done - $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit madwifi
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package madwifi checked in at Thu May 25 00:47:13 CEST 2006. -------- --- arch/i386/madwifi/madwifi.changes 2006-03-24 15:20:50.000000000 +0100 +++ madwifi/madwifi.changes 2006-05-25 00:01:02.000000000 +0200 @@ -1,0 +2,35 @@ +Wed May 24 16:48:07 CEST 2006 - jg(a)suse.de + +- disabled scanning when associated (bug 153733) +- update to version 0.9.0, changes (shortened): + * Fix the remaining radiotap issues + * Add support for showing iwlist supported events + * Fix segmentation fault when switching XR mode off + * don't retry control frames that were injected + * remove bogosity where the byte order is found from the hal + include files + * Prevent the 802.11 stack numbering channels outside the 802.11 + specifications + * Implement wireless extension (WEXT) > 18 ioctl's + * Use IWEVGENIE to report IEs for RSN and WPA in a human readabe + form + * Make wlanconfig slightly more vebose and less forgiving + * Fixed up some vap->iv_xrvap checks + * SMP/PREEMPTIBLE fixes + * Export module version information + * Fix some duplicate node errors by always finding old nodes + before allocating + * wext 19 fixes + * Solve a deadlock problem between user-context and tasklet + for IEEE80211_VAPS_LOCK + * Fix+update athdebug + * Enable use of QoS and short preamble in adhoc demo mode + * Time out nodes in ibss and adhoc demo modes + * honor retries for packet injection + * Fix issues with AR5211 cards when associating to a 802.11b/g AP + * Move the interface unit checks to wlanconfig + * do not ignore turbo channels if turbo on + * add the id map for sonicwall card + * Fix include directory for compat.h + +------------------------------------------------------------------- Old: ---- madwifi-arphrd.dif madwifi-enc-capa.patch madwifi-ng-r1468-20060309.tar.bz2 New: ---- madwifi-0.9.0.tar.bz2 madwifi-disable_assoc_scan.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ madwifi.spec ++++++ --- /var/tmp/diff_new_pack.wJ24Fc/_old 2006-05-25 00:46:48.000000000 +0200 +++ /var/tmp/diff_new_pack.wJ24Fc/_new 2006-05-25 00:46:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package madwifi (Version 1468) +# spec file for package madwifi (Version 0.9.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,26 +12,25 @@ Name: madwifi BuildRequires: kernel-source kernel-syms sharutils -%define madwifi_version r1468-20060309 -Summary: Tools for a configuring atheros cards -Version: 1468 -Release: 8 +%define madwifi_version 0.9.0 +Summary: Tools for configuring atheros cards +Version: 0.9.0 +Release: 1 Group: Hardware/Other -License: BSD, GPL +License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://madwifi.org/ Autoreqprov: on -Source: madwifi-ng-%{madwifi_version}.tar.bz2 +Source: madwifi-%{madwifi_version}.tar.bz2 Patch: madwifi.dif Patch2: madwifi-active_scan.dif -Patch3: madwifi-enc-capa.patch Patch4: madwifi-len_check.dif -Patch5: madwifi-arphrd.dif +Patch5: madwifi-disable_assoc_scan.dif ExclusiveArch: %ix86 x86_64 %suse_kernel_module_package -n madwifi kdump um %description -Tools for a configuring atheros cards +Tools for configuring atheros cards @@ -42,11 +41,11 @@ %package devel Group: Hardware/Other -License: Unknown, LGPL -Summary: Tools for a configuring atheros cards +License: BSD +Summary: Tools for configuring atheros cards %description devel -Tools for a configuring atheros cards +Tools for configuring atheros cards @@ -57,7 +56,7 @@ %package -n madwifi-KMP Group: System/Kernel -License: GPL, Contact author +License: Other License(s), see package, BSD Summary: kernel modules for atheros cards %description -n madwifi-KMP @@ -71,10 +70,9 @@ Greg Chesson <madwifi(a)atheros.com> (madwifi) %prep -%setup -n madwifi-ng-%{madwifi_version} +%setup -n madwifi-%{madwifi_version} %patch0 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p0 %patch5 -p1 echo "#define SVNVERSION \"%{version}\"" > svnversion.h @@ -87,7 +85,7 @@ mkdir -p obj for flavor in %flavors_to_build; do rm -rf obj/$flavor - cp -r madwifi-ng-%{madwifi_version} obj/$flavor + cp -r madwifi-%{madwifi_version} obj/$flavor make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ M=$PWD/obj/$flavor done @@ -120,6 +118,38 @@ %{_includedir}/%{name}-%{version} %changelog -n madwifi +* Wed May 24 2006 - jg(a)suse.de +- disabled scanning when associated (bug 153733) +- update to version 0.9.0, changes (shortened): + * Fix the remaining radiotap issues + * Add support for showing iwlist supported events + * Fix segmentation fault when switching XR mode off + * don't retry control frames that were injected + * remove bogosity where the byte order is found from the hal + include files + * Prevent the 802.11 stack numbering channels outside the 802.11 + specifications + * Implement wireless extension (WEXT) > 18 ioctl's + * Use IWEVGENIE to report IEs for RSN and WPA in a human readabe + form + * Make wlanconfig slightly more vebose and less forgiving + * Fixed up some vap->iv_xrvap checks + * SMP/PREEMPTIBLE fixes + * Export module version information + * Fix some duplicate node errors by always finding old nodes + before allocating + * wext 19 fixes + * Solve a deadlock problem between user-context and tasklet + for IEEE80211_VAPS_LOCK + * Fix+update athdebug + * Enable use of QoS and short preamble in adhoc demo mode + * Time out nodes in ibss and adhoc demo modes + * honor retries for packet injection + * Fix issues with AR5211 cards when associating to a 802.11b/g AP + * Move the interface unit checks to wlanconfig + * do not ignore turbo channels if turbo on + * add the id map for sonicwall card + * Fix include directory for compat.h * Fri Mar 24 2006 - agruen(a)suse.de - Cleanups in the spec file. * Thu Mar 09 2006 - jg(a)suse.de ++++++ madwifi-ng-r1468-20060309.tar.bz2 -> madwifi-0.9.0.tar.bz2 ++++++ ++++ 8363 lines of diff (skipped) ++++++ madwifi-disable_assoc_scan.dif ++++++ Index: madwifi-ng-r1560-20060519/net80211/ieee80211_scan.c =================================================================== --- madwifi-ng-r1560-20060519.orig/net80211/ieee80211_scan.c +++ madwifi-ng-r1560-20060519/net80211/ieee80211_scan.c @@ -324,6 +324,9 @@ scan_restart(struct scan_state *ss, u_in } if (vap->iv_opmode == IEEE80211_M_STA && vap->iv_state == IEEE80211_S_RUN) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: associated, not scanning\n", __func__); + return 0; if ((vap->iv_bss->ni_flags & IEEE80211_NODE_PWR_MGT) == 0) { /* * Initiate power save before going off-channel. ++++++ madwifi.dif ++++++ --- /var/tmp/diff_new_pack.wJ24Fc/_old 2006-05-25 00:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.wJ24Fc/_new 2006-05-25 00:46:55.000000000 +0200 @@ -1,8 +1,8 @@ -Index: madwifi-ng-r1462-20060307/net80211/Makefile +Index: madwifi-ng-0.9.0/net80211/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/net80211/Makefile -+++ madwifi-ng-r1462-20060307/net80211/Makefile -@@ -1,50 +1,7 @@ +--- madwifi-ng-0.9.0.orig/net80211/Makefile ++++ madwifi-ng-0.9.0/net80211/Makefile +@@ -1,71 +1,6 @@ -# -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting -# All rights reserved. @@ -48,27 +48,40 @@ -ifeq ($(obj),) -obj= . -endif -+-include $(ROOT)/Makefile.inc - +- -DEPTH= .. -# - # There are two authenticator mechanisms: an in-kernel implementation - # (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that - # requires a user process to manage the authentication process. By default -@@ -81,53 +38,4 @@ wlan_xauth-objs := ieee80211_xauth.o +-# There are two authenticator mechanisms: an in-kernel implementation +-# (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that +-# requires a user process to manage the authentication process. By default +-# the external authenticator is used. ieee80211_proto.c has a table of module +-# names that defines the default module to auto-load for each authentication +-# scheme; to get the in-kernel authenticator by default modify it to load +-# wlan_auth instead of wlan_xauth or manually load wlan_auth prior to use. +-# +-MOD_AUTH := wlan_xauth.o +-# +-# Scanning policy is split into modules. The default policy modules +-# separate station-mode scanning support from ap-mode scanning support. +-# +-MOD_SCAN := wlan_scan_sta.o wlan_scan_ap.o +-# +-# Modules to be built+installed +-# +-MOD_INSTALL := wlan.o wlan_wep.o wlan_tkip.o wlan_ccmp.o wlan_acl.o \ +- $(MOD_AUTH) $(MOD_SCAN) +- +-obj-m += $(MOD_INSTALL) ++-include $(ROOT)/Makefile.inc + + wlan-objs := if_media.o \ + ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \ +@@ -80,45 +15,3 @@ wlan_acl-objs := ieee80211_acl.o + wlan_xauth-objs := ieee80211_xauth.o wlan_scan_sta-objs :=ieee80211_scan_sta.o wlan_scan_ap-objs := ieee80211_scan_ap.o - +- -include $(obj)/${DEPTH}/Makefile.inc - --# If building into kernel --# We only have one target, so all modules go into it I guess? --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_NET80211) += $(MOD_INSTALL) --ifdef LINUX24 --O_TARGET := net80211.o --endif --endif - -INCS+= -I${HAL} -I${HAL}/${OS} -I$(obj)/${ATH_HAL} -I$(obj)/${WLAN} \ - -I${obj}/${DEPTH} @@ -109,11 +122,11 @@ - -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd - -rm -rf .tmp_versions -Index: madwifi-ng-r1462-20060307/ath_rate/onoe/Makefile +Index: madwifi-ng-0.9.0/ath_rate/onoe/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/ath_rate/onoe/Makefile -+++ madwifi-ng-r1462-20060307/ath_rate/onoe/Makefile -@@ -1,82 +1,6 @@ +--- madwifi-ng-0.9.0.orig/ath_rate/onoe/Makefile ++++ madwifi-ng-0.9.0/ath_rate/onoe/Makefile +@@ -1,75 +1,6 @@ -# -# Copyright (c) 2004 Sam Leffler, Errno Consulting -# Copyright (c) 2004 Video54 Technologies, Inc. @@ -169,13 +182,6 @@ - -include $(obj)/${DEPTH}/Makefile.inc - --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_RATE_ONOE) := $(ath_rate_onoe-objs) --ifdef LINUX24 --O_TARGET := $(obj-m) --endif --endif -- -INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \ - -I${obj}/${DEPTH} - @@ -198,11 +204,11 @@ - -ath_rate_onoe.o: ${ath_rate_onoe-objs} - $(LD) $(LDOPTS) -o ath_rate_onoe.$(KMODSUF) -r $(ath_rate_onoe-objs) -Index: madwifi-ng-r1462-20060307/ath_rate/amrr/Makefile +Index: madwifi-ng-0.9.0/ath_rate/amrr/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/ath_rate/amrr/Makefile -+++ madwifi-ng-r1462-20060307/ath_rate/amrr/Makefile -@@ -1,82 +1,6 @@ +--- madwifi-ng-0.9.0.orig/ath_rate/amrr/Makefile ++++ madwifi-ng-0.9.0/ath_rate/amrr/Makefile +@@ -1,75 +1,6 @@ -# -# Copyright (c) 2004 Sam Leffler, Errno Consulting -# Copyright (c) 2004 Video54 Technologies, Inc. @@ -258,13 +264,6 @@ - -include $(obj)/${DEPTH}/Makefile.inc - --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_RATE_AMRR) := $(ath_rate_amrr-objs) --ifdef LINUX24 --O_TARGET := $(obj-m) --endif --endif -- -INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \ - -I${obj}/${DEPTH} - @@ -287,11 +286,11 @@ - -ath_rate_amrr.o: ${ath_rate_amrr-objs} - $(LD) $(LDOPTS) -o ath_rate_amrr.$(KMODSUF) -r $(ath_rate_amrr-objs) -Index: madwifi-ng-r1462-20060307/ath_hal/Makefile +Index: madwifi-ng-0.9.0/ath_hal/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/ath_hal/Makefile -+++ madwifi-ng-r1462-20060307/ath_hal/Makefile -@@ -1,89 +1,17 @@ +--- madwifi-ng-0.9.0.orig/ath_hal/Makefile ++++ madwifi-ng-0.9.0/ath_hal/Makefile +@@ -1,87 +1,17 @@ -# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/ath_hal/Makefile#9 $ -# -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting @@ -331,21 +330,16 @@ +ROOT=$(src)/.. -DEPTH= .. +- +-include $(obj)/${DEPTH}/Makefile.inc +-include $(ROOT)/Makefile.inc obj-m += ath_hal.o - ath_hal-objs := ah_osdep.o hal.o - --include $(obj)/${DEPTH}/Makefile.inc - --# If building into kernel + ath_hal-objs := ah_osdep.o ${TARGET}.hal.o +-hostprogs-y := uudecode - --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_ATHEROS_HAL) := ah_osdep.o hal.o --ifdef LINUX24 --O_TARGET := ath_hal.o --endif --endif +-# For older 2.6 kernels +-host-progs := $(hostprogs-y) - -ifdef LINUX24 -export-objs := ah_osdep.o @@ -357,20 +351,24 @@ - --include $(TOPDIR)/Rules.make - --all: ah_osdep.c hal.o opt_ah.h +-all: opt_ah.h - $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) MODVERDIR=$(shell pwd)/${SYMBOLSDIR} modules - --ah_osdep.c: opt_ah.h -- cp -f ${HAL}/${OS}/ah_osdep.c ah_osdep.c -+$(src)/ah_osdep.c: $(src)/opt_ah.h -+ cp -f $(ROOT)/hal/linux/ah_osdep.c $(src)/ah_osdep.c +-ifdef LINUX24 +-$(obj)/uudecode: $(obj)/uudecode.c +- $(HOSTCC) $(HOSTCFLAGS) -o $@ $< +-endif + +-$(obj)/${TARGET}.hal.o: ${HAL}/public/${TARGET}.hal.o.uu $(obj)/uudecode ++$(obj)/${TARGET}.hal.o: $(ROOT)/hal/public/${TARGET}.hal.o.uu + echo "deps_$@ :=" >$(@D)/.$(@F).cmd +- $(obj)/uudecode -o $@ $< ++ uudecode -o $@ $< - $(obj)/hal.o: -- ${UUDECODE} ${HAL}/public/${TARGET}.hal.o.uu -- -opt_ah.h: ${HAL}/public/${TARGET}.opt_ah.h - cp -f ${HAL}/public/${TARGET}.opt_ah.h opt_ah.h -+ uudecode -o $(obj)/hal.o $(ROOT)/hal/public/${TARGET}.hal.o.uu ++$(src)/ah_osdep.c: $(src)/opt_ah.h ++ cp -f $(ROOT)/hal/linux/ah_osdep.c $(src)/ah_osdep.c -install: - test -d ${DESTDIR}/${MODULEPATH} || mkdir -p ${DESTDIR}/${MODULEPATH} @@ -378,20 +376,20 @@ - cp ath_hal.${KMODSUF} ${DESTDIR}/${MODULEPATH} - -clean: -- -rm -f *~ *.o *.ko *.mod.c +- -rm -f *~ *.o *.ko *.mod.c uudecode .uudecode.cmd - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd - -rm -rf .tmp_versions -# remove the files we copied to this dir -- -rm -f ah_osdep.c opt_ah.h hal.o +- -rm -f opt_ah.h +$(src)/opt_ah.h: $(ROOT)/hal/public/${TARGET}.opt_ah.h + cp -f $(ROOT)/hal/public/${TARGET}.opt_ah.h $(src)/opt_ah.h -ath_hal.o: ${ath_hal-objs} - $(LD) $(LDOPTS) -o ath_hal.$(KMODSUF) -r $(ath_hal-objs) -Index: madwifi-ng-r1462-20060307/tools/Makefile +Index: madwifi-ng-0.9.0/tools/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/tools/Makefile -+++ madwifi-ng-r1462-20060307/tools/Makefile +--- madwifi-ng-0.9.0.orig/tools/Makefile ++++ madwifi-ng-0.9.0/tools/Makefile @@ -32,19 +32,7 @@ DEPTH= .. # it's a more traditional name. TOOLPREFIX ?= $(CROSS_COMPILE) @@ -432,11 +430,11 @@ done install -d ${DESTDIR}${MANDIR}/man8 install -m 0644 man/*.8 ${DESTDIR}${MANDIR}/man8 -Index: madwifi-ng-r1462-20060307/ath/Makefile +Index: madwifi-ng-0.9.0/ath/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/ath/Makefile -+++ madwifi-ng-r1462-20060307/ath/Makefile -@@ -1,92 +1,7 @@ +--- madwifi-ng-0.9.0.orig/ath/Makefile ++++ madwifi-ng-0.9.0/ath/Makefile +@@ -1,83 +1,7 @@ -# -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting -# All rights reserved. @@ -502,15 +500,6 @@ -obj-m += ath_${BUSNAME}.o -ath_${BUSNAME}-objs := if_ath.o if_ath_${BUSNAME}.o - --# If building into kernel -- --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_ATHEROS) := $(ath_${BUSNAME}-objs) --ifdef LINUX24 --O_TARGET := $(obj-m) --endif --endif -- -INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH_HAL} \ - -I${obj}/${WLAN} -I${obj}/${DEPTH} - @@ -533,11 +522,11 @@ - -ath_${BUSNAME}.o: ${ath_${BUSNAME}-objs} - $(LD) $(LDOPTS) -o ath_${BUSNAME}.$(KMODSUF) -r $(ath_${BUSNAME}-objs) -Index: madwifi-ng-r1462-20060307/Makefile +Index: madwifi-ng-0.9.0/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/Makefile -+++ madwifi-ng-r1462-20060307/Makefile -@@ -1,190 +1,7 @@ +--- madwifi-ng-0.9.0.orig/Makefile ++++ madwifi-ng-0.9.0/Makefile +@@ -1,175 +1,7 @@ -# -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting -# All rights reserved. @@ -581,18 +570,17 @@ -# -DEPTH= . - --# release tag versioning ---include $(KERNELPATH)/ath_version.mk --export EXTRAVERSION -- -include Makefile.inc - -# NB: the order is important here -DIRS_MODULES= ${ATH_HAL} ${WLAN} ${ATH_RATE} ${ATH} - +-# export for make-release.bash +-export ATH_HAL +- -all: modules tools - --modules: configcheck svnversion.h +-modules: configcheck svnversion.h - mkdir -p ${SYMBOLSDIR} - for i in ${DIRS_MODULES}; do \ - $(MAKE) -C $$i || exit 1; \ @@ -600,15 +588,13 @@ - -.PHONY: svnversion.h -svnversion.h: -- echo -n '#define SVNVERSION "' > $@ - if [ -d .svn ]; then \ -- echo -n "$(shell svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//')" >> $@; \ +- ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \ +- echo "#define SVNVERSION \"svn r$$ver\"" > $@; \ - elif [ -s SNAPSHOT ]; then \ -- echo -n "$(shell sed -e '/^Revision: */!d;s///;q' SNAPSHOT)" >> $@; \ -- else \ -- echo -n "$(shell date +%F)" >> $@; \ -- fi -- echo '"' >> $@ +- ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \ +- echo "#define SVNVERSION \"svn r$$ver\"" > $@; \ +- fi; \ - -# conflicts with the 'tools' subdirectory -.PHONY: tools @@ -638,10 +624,6 @@ - sh scripts/find-madwifi-modules.sh $(DESTDIR)/lib/modules/$(KERNELRELEASE) - $(MAKE) -C ${TOOLS} uninstall - --FILES= ath_hal COPYRIGHT ath include Makefile Makefile.inc \ -- README release.h share net80211 ath_rate --HAL_TAG=ATH_HAL_20030802 -- -clean: - for i in ${DIRS_MODULES}; do \ - $(MAKE) -C $$i clean; \ @@ -672,14 +654,6 @@ -sanitycheck: - @echo -n "Checking requirements... " - -- @# check if kernel configuration file is available -- @if [ ! -f $(KERNELCONF) ]; then \ -- echo "FAILED"; \ -- echo "'$(KERNELCONF)' not found."; \ -- echo "You need to configure your kernel."; \ -- exit 1; \ -- fi -- - @# check if specified rate control is available - @if [ ! -d $(ATH_RATE) ]; then \ - echo "FAILED"; \ @@ -687,16 +661,12 @@ - exit 1; \ - fi - -- @# see if uudecode is available -- @if [ -z "$(UUDECODE)" ]; then \ -- echo "FAILED"; \ -- echo "The 'uudecode' tool was not found on your system. Please make sure"; \ -- echo "it is installed in your PATH, then try again."; \ -- exit 1; \ -- fi -- - @echo "ok." - +-.PHONY: release +-release: +- sh scripts/make-release.bash +- -# new targets should be inserted ABOVE this line in order to avoid -# problems with the included kernel configuration file below. -include $(KERNELCONF) @@ -706,7 +676,7 @@ -configcheck: sanitycheck - @echo -n "Checking kernel configuration... " - -- @# check version of kernel and wireless.h +- @# check version of kernel - @echo $(KERNELRELEASE) | grep -q -i '^[2-9]\.[4-9]\.' || { \ - echo "FAILED"; \ - echo "Only kernel versions 2.4.x and above are supported."; \ @@ -720,11 +690,15 @@ - echo "Please enable sysctl support."; \ - exit 1; \ - fi +- +- @# check wireless extensions support is enabled - @if [ -z "$(CONFIG_NET_RADIO)" ]; then \ - echo "FAILED"; \ - echo "Please enable wireless extensions."; \ - exit 1; \ - fi +- +- @# check crypto support is enabled - @if [ -z "$(CONFIG_CRYPTO)" ]; then \ - echo "FAILED"; \ - echo "Please enable crypto API."; \ @@ -732,51 +706,11 @@ - fi - - @echo "ok." -Index: madwifi-ng-r1462-20060307/tools/athstats.c -=================================================================== ---- madwifi-ng-r1462-20060307.orig/tools/athstats.c -+++ madwifi-ng-r1462-20060307/tools/athstats.c -@@ -57,6 +57,8 @@ - #include <ctype.h> - #include <unistd.h> - #include <err.h> -+#include <ctype.h> -+#include <unistd.h> - - #define __user - -@@ -268,8 +270,7 @@ main(int argc, char *argv[]) - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (argc > 1) { - u_long interval = strtoul(argv[1], NULL, 0); -- int line; -- sigset_t omask, nmask; -+ int line, omask; - u_int rate, rssi; - struct ath_stats cur, total; - u_long icur, ocur; -@@ -341,13 +342,10 @@ main(int argc, char *argv[]) - rate); - } - fflush(stdout); -- sigemptyset(&nmask); -- sigaddset(&nmask,SIGALRM); -- sigprocmask(SIG_BLOCK, &nmask, &omask); -- sigemptyset(&nmask); -+ omask = sigblock(sigmask(SIGALRM)); - if (!signalled) -- sigsuspend(&nmask); -- sigprocmask(SIG_SETMASK, &omask, NULL); -+ sigpause(0); -+ sigsetmask(omask); - signalled = 0; - alarm(interval); - line++; -Index: madwifi-ng-r1462-20060307/Makefile.inc +Index: madwifi-ng-0.9.0/Makefile.inc =================================================================== ---- madwifi-ng-r1462-20060307.orig/Makefile.inc -+++ madwifi-ng-r1462-20060307/Makefile.inc -@@ -1,221 +1,11 @@ +--- madwifi-ng-0.9.0.orig/Makefile.inc ++++ madwifi-ng-0.9.0/Makefile.inc +@@ -1,217 +1,14 @@ -# -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting -# All rights reserved. @@ -814,22 +748,14 @@ -# -# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/Makefile.inc#11 $ -# -+ROOT ?=. -+TARGET ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc/powerpc-be/)-elf - +- -ifeq ($(obj),) -obj= . -endif -+-include $(ROOT)/hal/public/${TARGET}.inc -+-include $(ROOT)/BuildCaps.inc - +- -# other locales sometimes cause trouble -export LC_ALL = POSIX -+EXTRA_CFLAGS+= -I$(ROOT)/hal -I$(ROOT)/hal/linux -I$(ROOT)/ath_hal -I. -I$(ROOT) \ -+ -I$(ROOT)/net80211 -I$(ROOT)/ath -I$(ROOT)/include ${COPTS} \ -+ -include $(ROOT)/include/compat.h -+EXTRA_CFLAGS+= -DATH_PCI - +- -# OS is the target operating system. Currently only Linux is supported. -OS= linux - @@ -875,20 +801,15 @@ -# The default KERNELPATH points to the directory where the currently -# running kernel was compiled. Note that the configuration and the -# version of the kernel tree might have changed since then. --ifndef KERNELPATH --ifeq ($(wildcard $(shell echo /lib/modules/`uname -r`/build)),) --KERNELPATH = /usr/src/linux --$(warning Default KERNELPATH not found, using $(KERNELPATH)) --else --KERNELPATH := $(shell cd /lib/modules/`uname -r`/build && pwd) --endif +-ifeq ($(wildcard $(KERNELPATH)),) +-KERNELPATH = /lib/modules/$(shell uname -r)/build +-# sanity check: does KERNELPATH exist? +-ifeq ($(shell cd $(KERNELPATH) && pwd),) +-$(error $(KERNELPATH) is missing, please set KERNELPATH) -endif -- +-export KERNELPATH -endif - --# sanity check: does KERNELPATH exist? --ifeq ($(wildcard $(KERNELPATH)),) --$(error KERNELPATH: $(KERNELPATH) does not exist) -endif - -# KERNELRELEASE is the target kernel's version. It's always taken from @@ -953,9 +874,9 @@ - -NM= nm -AWK= awk --UUDECODE ?= $(shell which uudecode 2>/dev/null) -- -- ++ROOT ?= . ++TARGET ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc/powerpc-be/)-elf + -# -# Path to the HAL source code. -# @@ -1001,16 +922,25 @@ -TARGETS=$(basename $(notdir $(wildcard ${HAL}/public/*.inc))) -$(error TARGET $(TARGET) is invalid, valid targets are: $(TARGETS)) -endif -- ++-include $(ROOT)/hal/public/${TARGET}.inc ++-include $(ROOT)/BuildCaps.inc + -include ${HAL}/public/${TARGET}.inc -include ${obj}/${DEPTH}/BuildCaps.inc -- ++EXTRA_CFLAGS+= -I$(ROOT)/hal -I$(ROOT)/hal/linux -I$(ROOT)/ath_hal -I. -I$(ROOT) \ ++ -I$(ROOT)/net80211 -I$(ROOT)/ath -I$(ROOT)/include ${COPTS} \ ++ -include $(ROOT)/include/compat.h ++EXTRA_CFLAGS+= -DATH_PCI + -SYMBOLSDIR=${DEPTH}/symbols -Index: madwifi-ng-r1462-20060307/ath_rate/sample/Makefile + + + # The following variables will affect developers only, and are used in the +Index: madwifi-ng-0.9.0/ath_rate/sample/Makefile =================================================================== ---- madwifi-ng-r1462-20060307.orig/ath_rate/sample/Makefile -+++ madwifi-ng-r1462-20060307/ath_rate/sample/Makefile -@@ -1,80 +1,7 @@ +--- madwifi-ng-0.9.0.orig/ath_rate/sample/Makefile ++++ madwifi-ng-0.9.0/ath_rate/sample/Makefile +@@ -1,73 +1,6 @@ -# -# Copyright (c) 2004 Sam Leffler, Errno Consulting -# Copyright (c) 2004 Video54 Technologies, Inc. @@ -1061,15 +991,8 @@ obj-m += ath_rate_sample.o ath_rate_sample-objs := sample.o - --include $(obj)/${DEPTH}/Makefile.inc - --ifneq ($(MAKING_MODULES),1) --obj-$(CONFIG_RATE_SAMPLE) := $(ath_rate_sample-objs) --ifdef LINUX24 --O_TARGET := $(obj-m) --endif --endif +-include $(obj)/${DEPTH}/Makefile.inc - -INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \ - -I${obj}/${DEPTH} @@ -1093,10 +1016,10 @@ - -ath_rate_sample.o: ${ath_rate_sample-objs} - $(LD) $(LDOPTS) -o ath_rate_sample.$(KMODSUF) -r $(ath_rate_sample-objs) -Index: madwifi-ng-r1462-20060307/hal/public/x86_64-elf.inc +Index: madwifi-ng-0.9.0/hal/public/x86_64-elf.inc =================================================================== ---- madwifi-ng-r1462-20060307.orig/hal/public/x86_64-elf.inc -+++ madwifi-ng-r1462-20060307/hal/public/x86_64-elf.inc +--- madwifi-ng-0.9.0.orig/hal/public/x86_64-elf.inc ++++ madwifi-ng-0.9.0/hal/public/x86_64-elf.inc @@ -41,10 +41,6 @@ # @@ -1108,10 +1031,10 @@ CC= ${TOOLPREFIX}gcc LD= ${TOOLPREFIX}ld STRIP= ${TOOLPREFIX}strip -Index: madwifi-ng-r1462-20060307/hal/public/powerpc-be-elf.inc +Index: madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc =================================================================== ---- madwifi-ng-r1462-20060307.orig/hal/public/powerpc-be-elf.inc -+++ madwifi-ng-r1462-20060307/hal/public/powerpc-be-elf.inc +--- madwifi-ng-0.9.0.orig/hal/public/powerpc-be-elf.inc ++++ madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc @@ -51,10 +51,6 @@ # --enable-languages=c --with-gnu-as --with-gnu-ld \ # --with-newlib --with-gxx-include-dir=${PREFIX}/$target/include ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit struts
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package struts checked in at Thu May 25 00:46:52 CEST 2006. -------- --- struts/struts.changes 2006-04-27 18:22:02.000000000 +0200 +++ struts/struts.changes 2006-05-24 12:13:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 12:11:52 CEST 2006 - dbornkessel(a)suse.de + +- changed hard requirement on jdbc-stdext to 'Recommends', as it is not available on some platforms (s390[x]) + Bug 177909 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ struts.spec ++++++ --- /var/tmp/diff_new_pack.A2wGq6/_old 2006-05-25 00:46:29.000000000 +0200 +++ /var/tmp/diff_new_pack.A2wGq6/_new 2006-05-25 00:46:29.000000000 +0200 @@ -26,7 +26,7 @@ %define jdkmajorver 1.4 %define legacyver 1.0 Version: 1.2.4 -Release: 21 +Release: 23 Summary: Web application framework License: Apache Group: Development/Libraries/Java @@ -44,7 +44,7 @@ Patch4: %{name}-bug-38749-backport-from-1.2.9.patch URL: http://jakarta.apache.org/struts/ Requires: servlet -Requires: jdbc-stdext +Recommends: jdbc-stdext Requires: jakarta-commons-beanutils >= 1.6.1 Requires: jakarta-commons-digester >= 1.5 Requires: jakarta-commons-fileupload >= 1.0 @@ -275,6 +275,9 @@ %{tomcat5ctxdir}/%{name}-*.xml %changelog -n struts +* Wed May 24 2006 - dbornkessel(a)suse.de +- changed hard requirement on jdbc-stdext to 'Recommends', as it is not available on some platforms (s390[x]) + Bug 177909 * Thu Apr 27 2006 - dbornkessel(a)suse.de - backported struts security fixes from 1.2.9 -> 1.2.4 Struts bugs: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0