May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit banshee
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package banshee checked in at Tue May 23 01:01:51 CEST 2006. -------- --- GNOME/banshee/banshee.changes 2006-05-19 22:59:36.000000000 +0200 +++ banshee/banshee.changes 2006-05-22 00:15:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 00:15:00 CEST 2006 - jpr(a)suse.de + +- Build and install dtdriver plugin for 32bit at atleast (#177506) + +------------------------------------------------------------------- New: ---- gstreamer-dtdriver-0.10.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.H2prdQ/_old 2006-05-23 01:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.H2prdQ/_new 2006-05-23 01:01:33.000000000 +0200 @@ -12,6 +12,9 @@ Name: banshee BuildRequires: dbus-1-mono gcc-c++ gconf-sharp2 gdk-pixbuf-devel glade-sharp2 gnome-desktop-devel gnome-sharp2 gstreamer010-plugins-base-devel gstreamer010-plugins-good gtk-sharp2-gapi intltool ipod-sharp libglade2-devel libidl-devel libmusicbrainz-devel libnjb-devel libwnck-devel mDNSResponder mDNSResponder-devel mono-basic mono-data-sqlite monodoc-core nautilus-cd-burner-devel njb-sharp perl-XML-Parser sqlite-devel update-desktop-files +%ifarch %ix86 +BuildRequires: RealPlayer +%endif %define prefix /usr %define sysconfdir /etc/opt/gnome %define gstreamerprefix /opt/gnome @@ -23,10 +26,11 @@ PreReq: filesystem gconf2 Requires: mono-core Version: 0.10.9 -Release: 28 +Release: 30 Source0: banshee-%{version}.tar.gz Source1: gstreamer-xing-0.10.0.tar.gz Source2: banshee-po.tar.bz2 +Source3: gstreamer-dtdriver-0.10.1.tar.gz Patch0: %{name}-libaoss-preload.patch Patch1: %{name}.exe.config.in.patch Patch2: %{name}-configure.patch @@ -143,7 +147,7 @@ Aaron Bockover <aaron(a)aaronbock.net> %prep -%setup -b1 -a2 +%setup -b1 -a2 -b3 if %version != 0.10.9 ; then echo "Please remove Source2 and Source3 and verify, that translations work." exit 1 @@ -179,6 +183,11 @@ cd ../gstreamer-xing-0.10.0 ./configure --enable-gstreamer=0.10 make +%ifarch %ix86 +cd ../gstreamer-dtdriver-0.10.1 +./configure --enable-gstreamer=0.10 +make +%endif %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -190,6 +199,11 @@ %suse_update_desktop_file -C "Play and organize music" -G "Music Player" -N "Banshee" %{name} cd ../gstreamer-xing-0.10.0 make install DESTDIR=$RPM_BUILD_ROOT +%ifarch %ix86 +cd ../gstreamer-dtdriver-0.10.1 +make install DESTDIR=$RPM_BUILD_ROOT +%endif +rm -f $RPM_BUILD_ROOT/%{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.*a rm -f $RPM_BUILD_ROOT/usr/%{_lib}/banshee/Banshee.Plugins/FileSystemMonitor.dll* rm -f $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas/filesystemmonitor.schemas @@ -262,7 +276,9 @@ %dir %{prefix}/%{_lib}/banshee/Banshee.MediaEngine/Helix %{prefix}/%{_lib}/banshee/Banshee.MediaEngine/Helix/*.dll* %{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.so -%{gstreamerprefix}/%{_lib}/gstreamer-%{gst_branch}/*.*a +%ifarch %ix86 +%{prefix}/%{_lib}/RealPlayer10/plugins/proxyfsys.so +%endif %files plugins-default %defattr(-,root,root) @@ -283,6 +299,8 @@ %{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll* %changelog -n banshee +* Mon May 22 2006 - jpr(a)suse.de +- Build and install dtdriver plugin for 32bit at atleast (#177506) * Fri May 19 2006 - jpr(a)suse.de -Improve SQL queries to improve performance (#168653) -Escape commas correclty (#147144) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit log4net
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package log4net checked in at Tue May 23 01:01:22 CEST 2006. -------- --- log4net/log4net.changes 2006-04-26 00:04:20.000000000 +0200 +++ log4net/log4net.changes 2006-05-22 17:21:07.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 17:17:11 CEST 2006 - jhargadon(a)novell.com + +- fix for bug 148685 This was a remotely triggerable vulnerability + issue where the syslog() function from glibc was used incorrectly. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4net.spec ++++++ --- /var/tmp/diff_new_pack.xbhEbs/_old 2006-05-23 01:01:04.000000000 +0200 +++ /var/tmp/diff_new_pack.xbhEbs/_new 2006-05-23 01:01:04.000000000 +0200 @@ -23,7 +23,7 @@ #Requires: mono-data >= 1.1.7.7 #Requires: mono-web >= 1.1.7.7 Version: 1.2.9 -Release: 17 +Release: 18 Summary: A .NET framework for logging Source: incubating-log4net-1.2.9-beta.zip Source1: log4net.key @@ -288,6 +288,9 @@ %{prefix}/lib/mono/log4net %changelog -n log4net +* Mon May 22 2006 - jhargadon(a)novell.com +- fix for bug 148685 This was a remotely triggerable vulnerability + issue where the syslog() function from glibc was used incorrectly. * Wed Apr 26 2006 - wberrier(a)suse.de - Change to noarch package, remove unnecessary deps * Sat Feb 25 2006 - aj(a)suse.de ++++++ incubating-log4net-1.2.9-beta.zip ++++++ Binary files log4net/incubating-log4net-1.2.9-beta.zip and log4net/incubating-log4net-1.2.9-beta.zip differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome2-SuSE
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package gnome2-SuSE checked in at Tue May 23 01:00:58 CEST 2006. -------- --- GNOME/gnome2-SuSE/gnome2-SuSE.changes 2006-05-05 02:18:58.000000000 +0200 +++ gnome2-SuSE/gnome2-SuSE.changes 2006-05-22 17:07:01.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 17:06:35 CEST 2006 - dobey(a)suse.de + +- Update GDM theme for pam-message label + Fixes https://bugzilla.novell.com/show_bug.cgi?id=175519 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome2-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.SRVfk8/_old 2006-05-23 01:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.SRVfk8/_new 2006-05-23 01:00:36.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 10.1 -Release: 27 +Release: 29 Summary: Distribution Default Settings for the GNOME 2.x Desktop Source: gnome2-SuSE-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,6 +73,9 @@ /opt/gnome/share/gnome-background-properties %changelog -n gnome2-SuSE +* Mon May 22 2006 - dobey(a)suse.de +- Update GDM theme for pam-message label + Fixes https://bugzilla.novell.com/show_bug.cgi?id=175519 * Fri May 05 2006 - jpr(a)suse.de - Remove errant vim swp file * Tue Apr 11 2006 - dobey(a)suse.de ++++++ gnome2-SuSE-10.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome2-defaults-10.1/gdm/GDM-SuSE/industrial.xml new/gnome2-defaults-10.1/gdm/GDM-SuSE/industrial.xml --- old/gnome2-defaults-10.1/gdm/GDM-SuSE/industrial.xml 2006-02-21 22:55:15.000000000 +0100 +++ new/gnome2-defaults-10.1/gdm/GDM-SuSE/industrial.xml 2006-05-22 16:54:21.000000000 +0200 @@ -74,6 +74,13 @@ </item> </fixed> </item> + + <item type="label" id="pam-message"> + <pos x="0" min-width="100" /> + <normal font="Sans 11" color="#ffffff" alpha="0.5"/> + <text> </text> + </item> + <![CDATA[  <item type="label" id="domain-label"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit apt
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package apt checked in at Tue May 23 01:00:56 CEST 2006. -------- --- apt/apt.changes 2006-03-27 14:16:55.000000000 +0200 +++ apt/apt.changes 2006-05-22 15:11:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 15:09:06 CEST 2006 - aosthof(a)suse.de + +- Fixed duplicate parameter name (#175554) + +------------------------------------------------------------------- New: ---- apt-duplicate_param_name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apt.spec ++++++ --- /var/tmp/diff_new_pack.Mavrag/_old 2006-05-23 01:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Mavrag/_new 2006-05-23 01:00:38.000000000 +0200 @@ -13,7 +13,7 @@ Name: apt BuildRequires: gcc-c++ joe rpm-devel sgml-skel xmlto Version: 0.5.15cnc7 -Release: 18 +Release: 24 Summary: A port of Debian's apt tools for RPM based distributions Group: System/Packages License: GPL @@ -33,6 +33,7 @@ Patch4: apt-ppc64.patch Patch5: apt-honour_post_conf.patch Patch6: apt-selfref_provides.patch +Patch7: apt-duplicate_param_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +103,7 @@ %patch4 %patch5 %patch6 +%patch7 mv po/it_IT.po po/it.po sed -e 's/it_IT/it/g' po/LINGUAS >po/LINGUAS.new && mv po/LINGUAS.new po/LINGUAS # The man 8 apt manual page does not provide any usefull information. @@ -248,6 +250,8 @@ %{_bindir}/gen* %changelog -n apt +* Mon May 22 2006 - aosthof(a)suse.de +- Fixed duplicate parameter name (#175554) * Mon Mar 27 2006 - pth(a)suse.de - Add patch from Panu Matilainen to allow self-referential provides entries. (bug #160567) ++++++ apt-duplicate_param_name.patch ++++++ --- apt-pkg/pkgcachegen.h.orig 2006-05-22 14:51:36.000000000 +0200 +++ apt-pkg/pkgcachegen.h 2006-05-22 14:53:11.000000000 +0200 @@ -59,7 +59,7 @@ class pkgCacheGenerator public: // CNC:2003-02-27 - We need this in rpmListParser. - bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,string Name); unsigned long WriteUniqString(const char *S,unsigned int Size); inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());}; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit amarok
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package amarok checked in at Tue May 23 01:00:29 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-05-20 18:40:45.000000000 +0200 +++ amarok/amarok.changes 2006-05-22 15:26:28.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 15:26:14 CEST 2006 - stbinner(a)suse.de + +- disable 64-bit helix wrapper patch until it's ported + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.8X2eA4/_old 2006-05-23 01:00:15.000000000 +0200 +++ /var/tmp/diff_new_pack.8X2eA4/_new 2006-05-23 01:00:15.000000000 +0200 @@ -20,7 +20,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.0 -Release: 3 +Release: 4 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -170,7 +170,7 @@ %patch7 %endif %ifarch x86_64 ppc64 ia64 -%patch8 +#%patch8 %endif cd .. %patch3 @@ -289,6 +289,8 @@ /opt/kde3/bin/amarok_libvisual %changelog -n amarok +* Mon May 22 2006 - stbinner(a)suse.de +- disable 64-bit helix wrapper patch until it's ported * Sat May 20 2006 - schwab(a)suse.de - Don't disable debuginfo package. * Wed May 17 2006 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-patch-translation
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package gnome-patch-translation checked in at Tue May 23 01:00:07 CEST 2006. -------- --- GNOME/gnome-patch-translation/gnome-patch-translation.changes 2006-05-18 11:09:16.000000000 +0200 +++ gnome-patch-translation/gnome-patch-translation.changes 2006-05-22 12:40:10.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 12:40:10 CEST 2006 - sbrabec(a)suse.cz + +- Updated de, es, fr, it, ja, pt_BR, zh_CN, zh_TW. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-patch-translation.spec ++++++ --- /var/tmp/diff_new_pack.He9fVG/_old 2006-05-23 00:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.He9fVG/_new 2006-05-23 00:59:51.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 0.1 -Release: 36 +Release: 37 Summary: Collect and Merge Translations From RPM Patches Source: gnome-patch-translation-files.tar.bz2 Source1: gnome-patch-translation.tar.bz2 @@ -62,6 +62,8 @@ /opt/gnome/share/gnome-patch-translation %changelog -n gnome-patch-translation +* Mon May 22 2006 - sbrabec(a)suse.cz +- Updated de, es, fr, it, ja, pt_BR, zh_CN, zh_TW. * Thu May 18 2006 - sbrabec(a)suse.cz - Merged missing nautilus string to translations (#173448). * Wed May 03 2006 - sbrabec(a)suse.cz ++++++ gnome-patch-translation.tar.bz2 ++++++ ++++ 2010 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit SuSEfirewall2
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package SuSEfirewall2 checked in at Tue May 23 00:59:45 CEST 2006. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2006-03-30 11:13:42.000000000 +0200 +++ SuSEfirewall2/SuSEfirewall2.changes 2006-05-22 13:39:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 13:39:38 CEST 2006 - lnussel(a)suse.de + +- fix FW_FORWARD not working with ipsec flag (#170530) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.4_SVNr142.tar.bz2 New: ---- SuSEfirewall2-3.4_SVNr143.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.Utc4kX/_old 2006-05-23 00:59:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Utc4kX/_new 2006-05-23 00:59:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.4_SVNr142) +# spec file for package SuSEfirewall2 (Version 3.4_SVNr143) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ # icecream 0 Name: SuSEfirewall2 -Version: 3.4_SVNr142 +Version: 3.4_SVNr143 Release: 1 License: GPL Group: Productivity/Networking/Security @@ -205,6 +205,8 @@ rm -rf %{buildroot} %changelog -n SuSEfirewall2 +* Mon May 22 2006 - lnussel(a)suse.de +- fix FW_FORWARD not working with ipsec flag (#170530) * Thu Mar 30 2006 - lnussel(a)suse.de - don't change igmp_max_memberships, correct docu for FW_KERNEL_SECURITY (#162086) ++++++ SuSEfirewall2-3.4_SVNr142.tar.bz2 -> SuSEfirewall2-3.4_SVNr143.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr142/EXAMPLES.html new/SuSEfirewall2-3.4_SVNr143/EXAMPLES.html --- old/SuSEfirewall2-3.4_SVNr142/EXAMPLES.html 2006-03-28 16:18:35.000000000 +0200 +++ new/SuSEfirewall2-3.4_SVNr143/EXAMPLES.html 2006-05-22 13:37:06.000000000 +0200 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 configuration examples</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2 configuration examples</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2483278">1. Simple dialup</a></span></dt><dt><span class="section"><a href="#id2483299">2. Small home network</a></span></dt><dt><span class="section"><a href="#id2483321">3. Small home network with additional WLAN</a></span></dt><dt><span class="section"><a href="#id2460778">4. Small company with external mail and web server</a></span></dt><dt><span class="section"><a href="#id2460811">5. Company with IPsec tunnel to subsidiary</a></span></dt><dt><span class="section"><a href="#id2460887">6. Company with web server in DMZ</a></span></dt><dt><span class="section"><a href="#id2460309">7. Complex scenario</a></span></dt><dt><span class="section"><a href="#id2460432">8. Laptop in private network but with additional public IP adresses</a></span></dt></dl></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 configuration examples</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410859"></a>SuSEfirewall2 configuration examples</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2483342">1. Simple dialup</a></span></dt><dt><span class="section"><a href="#id2483363">2. Small home network</a></span></dt><dt><span class="section"><a href="#id2483386">3. Small home network with additional WLAN</a></span></dt><dt><span class="section"><a href="#id2460778">4. Small company with external mail and web server</a></span></dt><dt><span class="section"><a href="#id2460810">5. Company with IPsec tunnel to subsidiary</a></span></dt><dt><span class="section"><a href="#id2460884">6. Company with web server in DMZ</a></span></dt><dt><span class="section"><a href="#id2460336">7. Complex scenario</a></span></dt><dt><span class="section"><a href="#id2460459">8. Laptop in private network but with additional public IP adresses</a></span></dt></dl></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p> All options <span class="emphasis"><em>not</em></span> mentioned in a scenario should be left as they are in the default <code class="filename">sysconfig/SuSEfirewall2</code> config file. Backup default config: <code class="filename">/usr/share/doc/packages/SuSEfirewall2/SuSEfirewall2.sysconfig</code> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483278"></a>1. Simple dialup</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483342"></a>1. Simple dialup</h2></div></div></div><p> A user with his nice SUSE Linux PC wants to be protected when connected to the internet via the ISDN dialup of his ISP. He wants to offer no services to the internet. He is not connected to any other network, nor @@ -15,7 +15,7 @@ </p><div class="informalexample"><pre class="programlisting"> FW_DEV_EXT="ippp0"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483299"></a>2. Small home network</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483363"></a>2. Small home network</h2></div></div></div><p> A family owns multiple PCs, a SUSE Linux PC is connected to the internet via DSL. The family's LAN uses private IPs therefore masquerading has to be used. The Firewall provides no services whatsoever. The address of the @@ -27,7 +27,7 @@ FW_MASQUERADE="yes" FW_MASQ_NETS="192.168.10.0/24"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483321"></a>3. Small home network with additional WLAN</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483386"></a>3. Small home network with additional WLAN</h2></div></div></div><p> Same network as above but additionally the Firewall is also connected to a wireless network. Hosts in the wireless network should get internet access but are not allowed to communicate with the internal network. The @@ -56,7 +56,7 @@ FW_SERVICES_INT_UDP="domain" FW_PROTECT_FROM_INT="yes"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460811"></a>5. Company with IPsec tunnel to subsidiary</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460810"></a>5. Company with IPsec tunnel to subsidiary</h2></div></div></div><p> A small company wants access to the internet for it's client PCs. Additionally the subsidiariaries client PCs should get access to the local network through an IPsec tunnel. Internet traffic should be @@ -83,7 +83,7 @@ flow. </p></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460887"></a>6. Company with web server in DMZ</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460884"></a>6. Company with web server in DMZ</h2></div></div></div><p> This company has got a more complex setup: @@ -149,7 +149,7 @@ target port of 53 (DNS) or 25 (Mail) to the local servers on the firewall. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460309"></a>7. Complex scenario</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460336"></a>7. Complex scenario</h2></div></div></div><p> </p><pre class="screen"> Internet @@ -207,7 +207,7 @@ # internet access to web server and trusted company access to internal Server FW_FORWARD_MASQ="0/0,10.0.10.2,tcp,80 0/0,10.0.10.2,tcp,443 \ 192.168.1.0/24,10.0.2.3,tcp,22"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460432"></a>8. Laptop in private network but with additional public IP adresses</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460459"></a>8. Laptop in private network but with additional public IP adresses</h2></div></div></div><p> </p><pre class="screen"> Internet diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr142/FAQ.html new/SuSEfirewall2-3.4_SVNr143/FAQ.html --- old/SuSEfirewall2-3.4_SVNr142/FAQ.html 2006-03-28 16:18:39.000000000 +0200 +++ new/SuSEfirewall2-3.4_SVNr143/FAQ.html 2006-05-22 13:37:09.000000000 +0200 @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 FAQ</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2 FAQ</h1></div></div><hr /></div><div class="qandaset"><dl><dt>1. <a href="#id2483245"> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 FAQ</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410859"></a>SuSEfirewall2 FAQ</h1></div></div><hr /></div><div class="qandaset"><dl><dt>1. <a href="#id2460136"> How do I allow access to my application XYZ on my firewall? - </a></dt><dt>2. <a href="#id2483302"> + </a></dt><dt>2. <a href="#id2483366"> How can I reduce the generated rule set as much as possible? - </a></dt><dt>3. <a href="#id2460818"> + </a></dt><dt>3. <a href="#id2460819"> How can I be sure that the firewall rules are active when I connect to the internet? </a></dt><dt>4. <a href="#id2460873"> How many interfaces are supported for each zone (EXT/DMZ/INT)? </a></dt><dt>5. <a href="#id2460891"> Why is communication between two interfaces in the same zone not working? - </a></dt><dt>6. <a href="#id2460920"> + </a></dt><dt>6. <a href="#id2460265"> I have set a web server in my DMZ. How do I configure SuSEfirewall2 to let people on the internet access my pages? - </a></dt><dt>7. <a href="#id2460271"> + </a></dt><dt>7. <a href="#id2460298"> What if my Server has a private IP address, how do I enable external access then? - </a></dt><dt>8. <a href="#id2460318">Some service does not work when the firewall is enabled. How do I find out what's wrong? - </a></dt><dt>9. <a href="#id2460392"> + </a></dt><dt>8. <a href="#id2460346">Some service does not work when the firewall is enabled. How do I find out what's wrong? + </a></dt><dt>9. <a href="#id2460419"> Some web site that offers port scanning claims my system is not protected properly as it still responds to ICMP echo requests (ping) - </a></dt><dt>10. <a href="#id2460416"> + </a></dt><dt>10. <a href="#id2460443"> Can't the evil guys detect whether my host is online if it responds to ICMP echo requests? - </a></dt><dt>11. <a href="#id2460436"> + </a></dt><dt>11. <a href="#id2460463"> SuSEfirewall2 drops most packets but it doesn't fully hide the presence of my machine. Isn't that a security hole? - </a></dt><dt>12. <a href="#id2460457"> + </a></dt><dt>12. <a href="#id2460484"> The ipsec0 interface I had with kernel 2.4 is gone. How do I assign IPsec traffic to a different zone now? - </a></dt><dt>13. <a href="#id2460508"> + </a></dt><dt>13. <a href="#id2460535"> Why is SuSEfirewall2 so slow? / Can't you just use iptables-restore? - </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%" /><tbody><tr class="question"><td align="left" valign="top"><a id="id2483245"></a><a id="id2483247"></a><b>1.</b></td><td align="left" valign="top"><p> + </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%" /><tbody><tr class="question"><td align="left" valign="top"><a id="id2460136"></a><a id="id2483312"></a><b>1.</b></td><td align="left" valign="top"><p> How do I allow access to my application XYZ on my firewall? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -48,7 +48,7 @@ into <code class="varname">FW_SERVICES_EXT_TCP</code> and execute <span><strong class="command">SuSEfirewall2</strong></span> again. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2483302"></a><a id="id2483304"></a><b>2.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2483366"></a><a id="id2483369"></a><b>2.</b></td><td align="left" valign="top"><p> How can I reduce the generated rule set as much as possible? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><div class="itemizedlist"><ul type="disc"><li><p> Set <code class="varname">FW_PROTECT_FROM_INTERNAL</code> to <code class="literal">"no"</code> @@ -65,7 +65,7 @@ Then you will have got much less rules, but also a lesser security. Better spend 50$ on a faster processor and more ram instead of using an old 486 as firewall. - </p></li></ul></div></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460818"></a><a id="id2460820"></a><b>3.</b></td><td align="left" valign="top"><p> + </p></li></ul></div></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460819"></a><a id="id2460821"></a><b>3.</b></td><td align="left" valign="top"><p> How can I be sure that the firewall rules are active when I connect to the internet? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -93,7 +93,7 @@ traffic with <code class="varname">FW_FORWARD</code>. Keep in mind that this affects all interfaces in all zones. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460920"></a><a id="id2460922"></a><b>6.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460265"></a><a id="id2460267"></a><b>6.</b></td><td align="left" valign="top"><p> I have set a web server in my DMZ. How do I configure SuSEfirewall2 to let people on the internet access my pages? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -103,7 +103,7 @@ just configure <code class="varname">FW_FORWARD_TCP</code> like this: </p><div class="informalexample"><pre class="programlisting">FW_FORWARD="0/0,1.1.1.1,tcp,80"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460271"></a><a id="id2460273"></a><b>7.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460298"></a><a id="id2460300"></a><b>7.</b></td><td align="left" valign="top"><p> What if my Server has a private IP address, how do I enable external access then? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -118,7 +118,7 @@ FW_MASQUERADE="yes" FW_FORWARD_MASQ="0/0,10.0.0.1,tcp,80"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460318"></a><a id="id2460320"></a><b>8.</b></td><td align="left" valign="top"><p>Some service does not work when the firewall is enabled. How do I find out what's wrong? + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460346"></a><a id="id2460348"></a><b>8.</b></td><td align="left" valign="top"><p>Some service does not work when the firewall is enabled. How do I find out what's wrong? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> Enable logging of all dropped packets and disable the log limit in @@ -146,7 +146,7 @@ If everything works again don't forget to set the log options back to normal to not fill up you log files. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460392"></a><a id="id2460394"></a><b>9.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460419"></a><a id="id2460422"></a><b>9.</b></td><td align="left" valign="top"><p> Some web site that offers port scanning claims my system is not protected properly as it still responds to ICMP echo requests (ping) </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -155,20 +155,20 @@ seriously impact the ability to track down network problems. It is therefore not considered nice behaviour for an internet citizen to drop pings. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460416"></a><a id="id2460418"></a><b>10.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460443"></a><a id="id2460445"></a><b>10.</b></td><td align="left" valign="top"><p> Can't the evil guys detect whether my host is online if it responds to ICMP echo requests? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> Yes but they can detect that anyways. The router at your provider behaves different depending on whether someone is dialed in or not. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460436"></a><a id="id2460438"></a><b>11.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460463"></a><a id="id2460465"></a><b>11.</b></td><td align="left" valign="top"><p> SuSEfirewall2 drops most packets but it doesn't fully hide the presence of my machine. Isn't that a security hole? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> You machine is never fully invisible, see previous question. The purpose of dropping packets is not to hide your machine but to slow down port scans. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460457"></a><a id="id2460459"></a><b>12.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460484"></a><a id="id2460486"></a><b>12.</b></td><td align="left" valign="top"><p> The <code class="literal">ipsec0</code> interface I had with kernel 2.4 is gone. How do I assign IPsec traffic to a different zone now? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -184,7 +184,7 @@ FW_SERVICES_EXT_UDP="isakmp" FW_PROTECT_FROM_INT="no"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460508"></a><a id="id2460510"></a><b>13.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460535"></a><a id="id2460537"></a><b>13.</b></td><td align="left" valign="top"><p> Why is SuSEfirewall2 so slow? / Can't you just use iptables-restore? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr142/README.html new/SuSEfirewall2-3.4_SVNr143/README.html --- old/SuSEfirewall2-3.4_SVNr142/README.html 2006-03-28 16:18:42.000000000 +0200 +++ new/SuSEfirewall2-3.4_SVNr143/README.html 2006-05-22 13:37:12.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2460133">1. Introduction</a></span></dt><dt><span class="section"><a href="#id2483332">2. Quickstart</a></span></dt><dd><dl><dt><span class="section"><a href="#id2483337">2.1. YaST2 firewall module</a></span></dt><dt><span class="section"><a href="#id2460784">2.2. Manual configuration</a></span></dt></dl></dd><dt><span class="section"><a href="#id2460842">3. Some words about security</a></span></dt><dt><span class="section"><a href="#id2460264">4. Reporting bugs</a></span></dt><dt><span class="section"><a href="#id2460288">5. Links</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460133"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410859"></a>SuSEfirewall2</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2460134">1. Introduction</a></span></dt><dt><span class="section"><a href="#id2483396">2. Quickstart</a></span></dt><dd><dl><dt><span class="section"><a href="#id2483402">2.1. YaST2 firewall module</a></span></dt><dt><span class="section"><a href="#id2460784">2.2. Manual configuration</a></span></dt></dl></dd><dt><span class="section"><a href="#id2460842">3. Some words about security</a></span></dt><dt><span class="section"><a href="#id2460290">4. Reporting bugs</a></span></dt><dt><span class="section"><a href="#id2460315">5. Links</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460134"></a>1. Introduction</h2></div></div></div><p> <code class="literal">SuSEfirewall2</code> is a shell script wrapper for the Linux firewall setup tool (<code class="literal">iptables</code>). It's controlled by a @@ -12,7 +12,7 @@ </p><div class="itemizedlist"><ul type="disc"><li><p>sets up secure filter rules by default</p></li><li><p>easy to configure</p></li><li><p>requires only a small configuration effort</p></li><li><p>zone based setup. Interfaces are grouped into zones</p></li><li><p>supports an arbitrary number of zones</p></li><li><p>supports forwarding, masquerading, port redirection</p></li><li><p>supports RPC services with dynamically assigned ports</p></li><li><p>allows special treatment of IPsec packets</p></li><li><p>IPv6 support (no forwarding/masquerading)</p></li><li><p>allows insertion of custom rules through hooks</p></li></ul></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483332"></a>2. Quickstart</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2483337"></a>2.1. YaST2 firewall module</h3></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483396"></a>2. Quickstart</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2483402"></a>2.1. YaST2 firewall module</h3></div></div></div><p> The YaST2 firewall module is the recommended tool for configuring SuSEfirewall2. It offers the most common features with a nice user @@ -76,13 +76,13 @@ Check your log files regularly for unusual entries. </p></li></ul></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460264"></a>4. Reporting bugs</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460290"></a>4. Reporting bugs</h2></div></div></div><p> Report any problems via <a href="http://www.suse.de/feedback" target="_top">http://www.suse.de/feedback</a>. For discussion about SuSEfirewall2 join the <a href="http://www.suse.com/us/private/support/online_help/mailinglists/index.html" target="_top">suse-security</a> mailinglist. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460288"></a>5. Links</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460315"></a>5. Links</h2></div></div></div><p> <a href="EXAMPLES.html" target="_top">Examples</a> </p><p> <a href="FAQ.html" target="_top">Frequently Asked Questions</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr142/SuSEfirewall2 new/SuSEfirewall2-3.4_SVNr143/SuSEfirewall2 --- old/SuSEfirewall2-3.4_SVNr142/SuSEfirewall2 2006-03-30 10:52:27.000000000 +0200 +++ new/SuSEfirewall2-3.4_SVNr143/SuSEfirewall2 2006-05-22 11:42:07.000000000 +0200 @@ -347,7 +347,8 @@ # ipsec ipsec_chain="" -IPSEC_MATCH="-m policy --dir in --pol ipsec --proto esp" +IPSEC_INPUT_MATCH="-m policy --dir in --pol ipsec --proto esp" +IPSEC_OUTPUT_MATCH="-m policy --dir out --pol ipsec --proto esp" ### zones @@ -1080,8 +1081,9 @@ allow_ipsec() { if [ -n "$ipsec_chain" ]; then - $IPTABLES -A INPUT -j "input_$ipsec_chain" $IPSEC_MATCH - $IPTABLES -A FORWARD -j "forward_$ipsec_chain" $IPSEC_MATCH + $IPTABLES -A INPUT -j "input_$ipsec_chain" $IPSEC_INPUT_MATCH + $IPTABLES -A FORWARD -j "forward_$ipsec_chain" $IPSEC_INPUT_MATCH + $IPTABLES -A FORWARD -j "forward_$ipsec_chain" $IPSEC_OUTPUT_MATCH fi } @@ -1594,7 +1596,7 @@ # <source network>,<destination network>[,protocol[,port[,flags]]] forwarding_rules() { - local nets net1 net2 flags more_args chain + local nets net1 net2 flags more_args_in more_args_out chain for nets in $FW_FORWARD; do IFS=, eval set -- \$nets @@ -1604,12 +1606,14 @@ port="$4" flags="$5" rport="" - more_args= + more_args_in= + more_args_out= case "$flags" in "") ;; ipsec) - more_args="$IPSEC_MATCH" + more_args_in="$IPSEC_INPUT_MATCH" + more_args_out="$IPSEC_OUTPUT_MATCH" ;; *) echo "Error: unsupported flag in FW_FORWARD: $flags" @@ -1624,10 +1628,16 @@ if [ -n "$net1" -a -n "$net2" ]; then for chain in $forward_zones; do chain=forward_$chain - $LAC $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port -m state --state NEW $more_args - $LAA $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port $more_args - $IPTABLES -A $chain -j "$ACCEPT" -m state --state NEW,ESTABLISHED,RELATED -s $net1 -d $net2 $proto $port $more_args - $IPTABLES -A $chain -j "$ACCEPT" -m state --state ESTABLISHED,RELATED -s $net2 -d $net1 $proto $rport $more_args + $LAC $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port -m state --state NEW $more_args_in + $LAA $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port $more_args_in + $IPTABLES -A $chain -j "$ACCEPT" -m state --state NEW,ESTABLISHED,RELATED -s $net1 -d $net2 $proto $port $more_args_in + $IPTABLES -A $chain -j "$ACCEPT" -m state --state ESTABLISHED,RELATED -s $net2 -d $net1 $proto $rport $more_args_in + if [ -n "$more_args_out" ]; then + $LAC $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port -m state --state NEW $more_args_out + $LAA $IPTABLES -A $chain -j LOG ${LOG}"-`rulelog $chain`-ACC-FORW " -s $net1 -d $net2 $proto $port $more_args_out + $IPTABLES -A $chain -j "$ACCEPT" -m state --state NEW,ESTABLISHED,RELATED -s $net1 -d $net2 $proto $port $more_args_out + $IPTABLES -A $chain -j "$ACCEPT" -m state --state ESTABLISHED,RELATED -s $net2 -d $net1 $proto $rport $more_args_out + fi done else error "too few parameters in FW_FORWARD -> $nets" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package NetworkManager checked in at Tue May 23 00:59:29 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-19 12:20:51.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-22 17:32:50.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 22 17:28:52 CEST 2006 - rml(a)suse.de + +- Fix ypbind/autofs behavior to never automatically start either, + but only reload as needed (Novell bug #175935) +- nm-applet: Fix crash on icon-theme change if icons no longer + exist (Novell bug #177426) +- Fix bug with weirdly-named network interfaces (GNOME bug #330832) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.oBKmnf/_old 2006-05-23 00:59:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oBKmnf/_new 2006-05-23 00:59:20.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 36 +Release: 37 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -261,6 +261,12 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Mon May 22 2006 - rml(a)suse.de +- Fix ypbind/autofs behavior to never automatically start either, + but only reload as needed (Novell bug #175935) +- nm-applet: Fix crash on icon-theme change if icons no longer + exist (Novell bug #177426) +- Fix bug with weirdly-named network interfaces (GNOME bug #330832) * Fri May 19 2006 - ro(a)suse.de - fix requirement. sysconfig in sles10 has release 13.3 currently (the version in sysconfig should have been fixed instead of ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.oBKmnf/_old 2006-05-23 00:59:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oBKmnf/_new 2006-05-23 00:59:20.000000000 +0200 @@ -1,14 +1,15 @@ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE - ChangeLog | 245 +++++++++++++++ + ChangeLog | 278 ++++++++++++++++++ NEWS | 5 configure.in | 11 gnome/applet/applet-compat.c | 2 gnome/applet/applet-dbus-devices.c | 9 gnome/applet/applet-dbus-info.c | 14 - gnome/applet/applet.c | 99 ------ + gnome/applet/applet.c | 153 +++------ gnome/applet/applet.glade | 60 +-- gnome/applet/applet.h | 4 + gnome/applet/main.c | 22 - gnome/applet/menu-items.c | 59 ++- gnome/applet/menu-items.h | 2 gnome/applet/nm-gconf-wso-wpa-eap.c | 105 +++--- @@ -19,7 +20,7 @@ gnome/vpn-properties/Makefile.am | 6 gnome/vpn-properties/clipboard.c | 74 ++++ gnome/vpn-properties/clipboard.h | 6 - gnome/vpn-properties/nm-vpn-properties.c | 42 ++ + gnome/vpn-properties/nm-vpn-properties.c | 44 ++ initscript/Arch/Makefile.am | 4 initscript/Arch/networkmanager-dispatcher.in | 54 +++ initscript/Arch/networkmanager.in | 55 +++ @@ -34,7 +35,8 @@ src/NetworkManager.c | 7 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 - src/NetworkManagerDbus.c | 8 + src/NetworkManagerDbus.c | 74 ++-- + src/NetworkManagerDbus.h | 2 src/NetworkManagerMain.h | 1 src/NetworkManagerPolicy.c | 4 src/NetworkManagerSystem.c | 291 +++++++++---------- @@ -42,12 +44,12 @@ src/NetworkManagerUtils.c | 15 src/NetworkManagerUtils.h | 1 src/backends/Makefile.am | 4 - src/backends/NetworkManagerSuSE.c | 66 ++-- + src/backends/NetworkManagerSuSE.c | 72 +++- src/backends/interface_parser.c | 29 + src/dhcp-manager/nm-dhcp-manager.c | 7 src/nm-ap-security-wep.c | 15 src/nm-dbus-net.c | 1 - src/nm-dbus-nm.c | 5 + src/nm-dbus-nm.c | 21 - src/nm-dbus-nmi.c | 1 src/nm-device-802-11-wireless.c | 217 +++++++++----- src/nm-device-802-11-wireless.h | 2 @@ -60,12 +62,45 @@ test/Makefile.am | 5 test/nm-online.c | 141 +++++++++ test/nm-tool.c | 4 - 60 files changed, 1575 insertions(+), 730 deletions(-) + 62 files changed, 1705 insertions(+), 801 deletions(-) diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 -+++ NetworkManager/ChangeLog 2006-05-17 16:04:11.000000000 -0400 -@@ -1,3 +1,248 @@ ++++ NetworkManager/ChangeLog 2006-05-22 11:24:12.000000000 -0400 +@@ -1,3 +1,281 @@ ++2006-05-22 Robert Love <rml(a)novell.com> ++ ++ * src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and ++ autofs on interface up if NIS is configured. On interface down, do ++ nothing. ++ ++2006-05-22 Robert Love <rml(a)novell.com> ++ ++ * gnome/applet/applet.c: Zero out the icon pointers before we set them, ++ to avoid calling g_object_unref() on stale pointers on error in ++ nma_icons_free(). This happens because we short-circuit loaded the ++ icons on the first failure but then free all icons. Normally we have ++ no issue because the icons were zero'ed out malloc, but we have stale ++ pointer data after nma_icon_theme_changed(). ++ * gnome/applet/main.c: Return error code if nma_new() failed. ++ ++2006-05-21 Dan Williams <dcbw(a)redhat.com> ++ ++ Patch from Adam Schreiber <sadam(a)clemson.edu> ++ * gnome/vpn-properties/nm-vpn-properties.c ++ - (main): correct Gnome program name (gnome.org #342498) ++ ++2006-05-21 Dan Williams <dcbw(a)redhat.com> ++ ++ Fix gnome.org #330832 based on patch from Crispin Flowerday <crispin(a)gnome.org> ++ ++ * src/NetworkManagerDbus.[ch] ++ - nm_dbus_get_device_from_object_path -> nm_dbus_get_device_from_escaped_object_path: ++ clarify that function's argument should be an escaped dbus object ++ path, and look for path segment end before returning a match ++ * src/nm-dbus-nm.c: ++ - Fix up users of nm_dbus_get_device_from_escaped_object_path() ++ +2006-05-17 Robert Love <rml(a)novell.com> + + Functionality to differentiate Ad-Hoc networks from infrastructure @@ -367,7 +402,7 @@ man/NetworkManagerDispatcher.1 diff -urN NetworkManager-0.6.2/gnome/applet/applet.c NetworkManager/gnome/applet/applet.c --- NetworkManager-0.6.2/gnome/applet/applet.c 2006-03-24 10:54:01.000000000 -0500 -+++ NetworkManager/gnome/applet/applet.c 2006-05-17 16:04:11.000000000 -0400 ++++ NetworkManager/gnome/applet/applet.c 2006-05-22 11:14:37.000000000 -0400 @@ -374,86 +374,6 @@ } @@ -506,6 +541,108 @@ gtk_widget_show_all (menu); return menu; +@@ -2633,7 +2548,7 @@ + + static void nma_icons_free (NMApplet *applet) + { +- gint i,j; ++ int i; + + g_object_unref (applet->no_connection_icon); + g_object_unref (applet->wired_icon); +@@ -2647,17 +2562,49 @@ + g_object_unref (applet->wireless_100_icon); + + for (i = 0; i < NUM_CONNECTING_STAGES; i++) ++ { ++ int j; ++ + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + g_object_unref (applet->network_connecting_icons[i][j]); ++ } + + for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) + g_object_unref (applet->vpn_connecting_icons[i]); + } + ++static void nma_icons_zero (NMApplet *applet) ++{ ++ int i; ++ ++ applet->no_connection_icon = NULL; ++ applet->wired_icon = NULL; ++ applet->adhoc_icon = NULL; ++ applet->vpn_lock_icon = NULL; ++ ++ applet->wireless_00_icon = NULL; ++ applet->wireless_25_icon = NULL; ++ applet->wireless_50_icon = NULL; ++ applet->wireless_75_icon = NULL; ++ applet->wireless_100_icon = NULL; ++ ++ for (i = 0; i < NUM_CONNECTING_STAGES; i++) ++ { ++ int j; ++ ++ for (j = 0; j < NUM_CONNECTING_FRAMES; j++) ++ applet->network_connecting_icons[i][j] = NULL; ++ } ++ ++ for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) ++ applet->vpn_connecting_icons[i] = NULL; ++ ++} ++ + #define ICON_LOAD(x, y) \ + { \ + GError *err = NULL; \ +- x = gtk_icon_theme_load_icon (icon_theme, y, icon_size, 0, &err); \ ++ x = gtk_icon_theme_load_icon (icon_theme, y, 22, 0, &err); \ + if (x == NULL) { \ + success = FALSE; \ + g_warning ("Icon %s missing: %s", y, err->message); \ +@@ -2669,12 +2616,14 @@ + static gboolean + nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme) + { +- char * name; +- int i, j; +- gboolean success = FALSE; ++ int i; ++ gboolean success; + +- /* Assume icons are square */ +- gint icon_size = 22; ++ /* ++ * NULL out the icons, so if we error and call nma_icons_free(), we don't hit stale ++ * data on the not-yet-reached icons. This can happen off nma_icon_theme_changed(). ++ */ ++ nma_icons_zero (applet); + + ICON_LOAD(applet->no_connection_icon, "nm-no-connection"); + ICON_LOAD(applet->wired_icon, "nm-device-wired"); +@@ -2689,8 +2638,12 @@ + + for (i = 0; i < NUM_CONNECTING_STAGES; i++) + { ++ int j; ++ + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + { ++ char *name; ++ + name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1); + ICON_LOAD(applet->network_connecting_icons[i][j], name); + g_free (name); +@@ -2699,6 +2652,8 @@ + + for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) + { ++ char *name; ++ + name = g_strdup_printf ("nm-vpn-connecting%02d", i+1); + ICON_LOAD(applet->vpn_connecting_icons[i], name); + g_free (name); diff -urN NetworkManager-0.6.2/gnome/applet/applet-compat.c NetworkManager/gnome/applet/applet-compat.c --- NetworkManager-0.6.2/gnome/applet/applet-compat.c 2006-02-21 02:02:55.000000000 -0500 +++ NetworkManager/gnome/applet/applet-compat.c 2006-05-01 14:58:36.000000000 -0400 @@ -869,6 +1006,61 @@ void nma_schedule_warning_dialog (NMApplet *applet, const char *msg); gboolean nma_driver_notify (gpointer user_data); void nma_show_vpn_failure_alert (NMApplet *applet, const char *member, const char *vpn_name, const char *error_msg); +diff -urN NetworkManager-0.6.2/gnome/applet/main.c NetworkManager/gnome/applet/main.c +--- NetworkManager-0.6.2/gnome/applet/main.c 2006-02-27 01:26:31.000000000 -0500 ++++ NetworkManager/gnome/applet/main.c 2006-05-22 11:14:37.000000000 -0400 +@@ -22,7 +22,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-#include <config.h> ++# include <config.h> + #endif + + #include <string.h> +@@ -37,15 +37,10 @@ + gtk_main_quit (); + } + +-static gboolean session_save (GnomeClient *client, gpointer client_data) +-{ +- return TRUE; +-} +- + int main (int argc, char *argv[]) + { + NMApplet * nma; +- GnomeClient * client = NULL; ++ GnomeClient * client; + + gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE, + argc, argv, +@@ -54,18 +49,19 @@ + client = gnome_master_client (); + gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY); + +- g_signal_connect (client, "save_yourself", G_CALLBACK (session_save), NULL); ++ g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL); + g_signal_connect (client, "die", G_CALLBACK (session_die), NULL); + + bindtextdomain (GETTEXT_PACKAGE, NULL); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + +- if ((nma = nma_new ())) +- { +- gtk_widget_show_all (GTK_WIDGET (nma)); +- gtk_main (); +- } ++ nma = nma_new (); ++ if (!nma) ++ exit (EXIT_FAILURE); ++ ++ gtk_widget_show_all (GTK_WIDGET (nma)); ++ gtk_main (); + + return 0; + } diff -urN NetworkManager-0.6.2/gnome/applet/menu-items.c NetworkManager/gnome/applet/menu-items.c --- NetworkManager-0.6.2/gnome/applet/menu-items.c 2005-12-29 11:54:34.000000000 -0500 +++ NetworkManager/gnome/applet/menu-items.c 2006-05-17 16:04:12.000000000 -0400 @@ -1457,11 +1649,11 @@ glade_DATA = nm-vpn-properties.glade diff -urN NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c NetworkManager/gnome/vpn-properties/nm-vpn-properties.c --- NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c 2006-03-13 14:41:38.000000000 -0500 -+++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-04-20 11:12:41.000000000 -0400 ++++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-05-22 11:14:21.000000000 -0400 @@ -1,5 +1,5 @@ /*************************************************************************** - * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.1 2006/03/13 19:41:38 rml Exp $ -+ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.4 2006/04/20 15:12:41 rml Exp $ ++ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.5 2006/05/21 17:50:25 dcbw Exp $ * * nm-vpn-properties.c : GNOME UI dialogs for manipulating VPN connections * @@ -1570,6 +1762,15 @@ druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection")); /* make the druid window modal wrt. our main window */ +@@ -1091,7 +1111,7 @@ + goto out; + } + +- gnome_program_init (GETTEXT_PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, ++ gnome_program_init ("nm-vpn-properties", VERSION, LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_NONE, GNOME_PARAM_NONE); + + glade_gnome_init (); diff -urN NetworkManager-0.6.2/initscript/Arch/Makefile.am NetworkManager/initscript/Arch/Makefile.am --- NetworkManager-0.6.2/initscript/Arch/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ NetworkManager/initscript/Arch/Makefile.am 2006-03-27 13:30:57.000000000 -0500 @@ -2519,7 +2720,7 @@ $(GTHREAD_CFLAGS) \ diff -urN NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c NetworkManager/src/backends/NetworkManagerSuSE.c --- NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c 2006-03-27 10:03:51.000000000 -0500 -+++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-05-16 13:26:25.000000000 -0400 ++++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-05-22 11:23:20.000000000 -0400 @@ -354,7 +354,7 @@ NMIP4Config * config; gboolean use_dhcp; @@ -2596,11 +2797,27 @@ ypconf = fopen ("/etc/yp.conf", "w"); if (ypconf) -@@ -1166,20 +1168,42 @@ +@@ -1140,12 +1142,12 @@ + if (stat ("/usr/sbin/rcypbind", &sb) != -1) + { + nm_info ("Restarting ypbind."); +- nm_spawn_process ("/usr/sbin/rcypbind restart"); ++ nm_spawn_process ("/usr/sbin/rcypbind reload"); + } + if (stat ("/usr/sbin/rcautofs", &sb) != -1) + { + nm_info ("Restarting autofs."); +- nm_spawn_process ("/usr/sbin/rcautofs restart"); ++ nm_spawn_process ("/usr/sbin/rcautofs reload"); + } + } + } +@@ -1166,20 +1168,44 @@ */ void nm_system_shutdown_nis (void) { - struct stat sb; ++#if 0 /* XXX: let's not touch NIS, for now; probably need to make this a configurable option */ + char *name, *buf = NULL; + shvarFile *file; @@ -2643,13 +2860,14 @@ + svCloseFile (file); +out_gfree: + g_free (name); ++#endif } + /* * nm_system_set_hostname * -@@ -1251,12 +1275,12 @@ +@@ -1251,12 +1277,12 @@ shvarFile *file; gboolean ret = TRUE; @@ -2664,7 +2882,7 @@ if (!buf) goto out_close; -@@ -1279,7 +1303,7 @@ +@@ -1279,7 +1305,7 @@ * Return a user-provided or system-mandated MTU for this device or zero if * no such MTU is provided. */ @@ -2777,22 +2995,106 @@ g_thread_init (NULL); diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.c NetworkManager/src/NetworkManagerDbus.c --- NetworkManager-0.6.2/src/NetworkManagerDbus.c 2006-02-24 13:59:03.000000000 -0500 -+++ NetworkManager/src/NetworkManagerDbus.c 2006-04-06 10:13:19.000000000 -0400 -@@ -287,11 +287,9 @@ ++++ NetworkManager/src/NetworkManagerDbus.c 2006-05-22 11:14:21.000000000 -0400 +@@ -119,52 +119,50 @@ + + + /* +- * nm_dbus_get_device_from_object_path ++ * nm_dbus_get_device_from_escaped_object_path + * +- * Returns the device associated with a dbus object path ++ * Returns the device associated with an _escaped_ dbus object path + * + */ +-NMDevice *nm_dbus_get_device_from_object_path (NMData *data, const char *path) ++NMDevice *nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path) + { +- NMDevice *dev = NULL; ++ NMDevice *dev = NULL; ++ GSList * elt; + + g_return_val_if_fail (path != NULL, NULL); + g_return_val_if_fail (data != NULL, NULL); + +- /* FIXME +- * This function could be much more efficient, for example we could +- * actually _parse_ the object path, but that's a lot more code and +- * stupid stuff. The approach below is slower, less efficient, but +- * less code and less error-prone. +- */ +- +- /* Iterate over device list */ +- if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__)) +- { +- GSList *elt; +- char compare_path[100]; +- char *escaped_compare_path; ++ if (!nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__)) ++ return NULL; + +- for (elt = data->dev_list; elt; elt = g_slist_next (elt)) ++ /* Iterate over the device list looking for the device with the matching object path. */ ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) ++ { ++ char *compare_path; ++ char *escaped_compare_path; ++ int len; ++ ++ if (!(dev = (NMDevice *)(elt->data))) ++ continue; ++ ++ compare_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev)); ++ escaped_compare_path = nm_dbus_escape_object_path (compare_path); ++ g_free (compare_path); ++ len = strlen (escaped_compare_path); ++ ++ /* Compare against our constructed path, but ignore any trailing elements */ ++ if ( (strncmp (path, escaped_compare_path, len) == 0) ++ && ((path[len] == '\0' || path[len] == '/'))) + { +- if ((dev = (NMDevice *)(elt->data))) +- { +- snprintf (compare_path, 100, "%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev)); +- escaped_compare_path = nm_dbus_escape_object_path (compare_path); +- /* Compare against our constructed path, but ignore any trailing elements */ +- if (strncmp (path, compare_path, strlen (escaped_compare_path)) == 0) +- { +- g_free (escaped_compare_path); +- break; +- } +- g_free (escaped_compare_path); +- dev = NULL; +- } ++ g_free (escaped_compare_path); ++ break; + } +- nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); ++ g_free (escaped_compare_path); ++ dev = NULL; + } ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); + +- return (dev); ++ return dev; + } + + +@@ -287,11 +285,9 @@ /* - * nm_dbus_network_status_from_data +- * +- * Return a network status string based on our network data + * nm_get_app_state_from_data * -- * Return a network status string based on our network data -- * - * Caller MUST free returned value + * Return the state of the network connection * */ NMState nm_get_app_state_from_data (NMData *data) -@@ -304,7 +302,7 @@ +@@ -304,7 +300,7 @@ return NM_STATE_ASLEEP; act_dev = nm_get_active_device (data); @@ -2801,6 +3103,27 @@ return NM_STATE_DISCONNECTED; if (nm_device_is_activating (act_dev)) +@@ -619,7 +615,7 @@ + + path = dbus_message_get_path (message); + +- if (!(dev = nm_dbus_get_device_from_object_path (data, path))) ++ if (!(dev = nm_dbus_get_device_from_escaped_object_path (data, path))) + reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound", "The requested network device does not exist."); + else + { +diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.h NetworkManager/src/NetworkManagerDbus.h +--- NetworkManager-0.6.2/src/NetworkManagerDbus.h 2005-12-31 03:21:22.000000000 -0500 ++++ NetworkManager/src/NetworkManagerDbus.h 2006-05-22 11:14:21.000000000 -0400 +@@ -69,7 +69,7 @@ + void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); + void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); + +-NMDevice * nm_dbus_get_device_from_object_path (NMData *data, const char *path); ++NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); + + NMState nm_get_app_state_from_data (NMData *data); + diff -urN NetworkManager-0.6.2/src/NetworkManagerMain.h NetworkManager/src/NetworkManagerMain.h --- NetworkManager-0.6.2/src/NetworkManagerMain.h 2006-02-26 23:31:52.000000000 -0500 +++ NetworkManager/src/NetworkManagerMain.h 2006-04-06 10:13:19.000000000 -0400 @@ -3276,7 +3599,7 @@ nm_dbus_method_list_add_method (list, "getStrength", nm_dbus_net_get_strength); diff -urN NetworkManager-0.6.2/src/nm-dbus-nm.c NetworkManager/src/nm-dbus-nm.c --- NetworkManager-0.6.2/src/nm-dbus-nm.c 2006-02-25 21:16:53.000000000 -0500 -+++ NetworkManager/src/nm-dbus-nm.c 2006-04-06 10:13:19.000000000 -0400 ++++ NetworkManager/src/nm-dbus-nm.c 2006-05-22 11:14:21.000000000 -0400 @@ -170,6 +170,8 @@ if (!nm_system_activate_dialup (nm_data->dialup_list, dialup)) reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "ActivationFailed", @@ -3295,7 +3618,65 @@ nm_unlock_mutex (nm_data->dialup_list_mutex, __FUNCTION__); out: -@@ -560,6 +564,7 @@ +@@ -224,7 +228,6 @@ + NMDevice * dev = NULL; + DBusMessage * reply = NULL; + char * dev_path; +- char * unescaped_dev_path = NULL; + NMAccessPoint * ap = NULL; + DBusMessageIter iter; + +@@ -243,9 +246,7 @@ + } + + dbus_message_iter_get_basic (&iter, &dev_path); +- unescaped_dev_path = nm_dbus_unescape_object_path (dev_path); +- dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path); +- g_free (unescaped_dev_path); ++ dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path); + + /* Ensure the device exists in our list and is supported */ + if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED)) +@@ -328,7 +329,6 @@ + NMDevice * dev = NULL; + DBusMessage * reply = NULL; + char * dev_path = NULL; +- char * unescaped_dev_path = NULL; + NMAccessPoint * new_ap = NULL; + NMAPSecurity * security = NULL; + char * essid = NULL; +@@ -348,9 +348,7 @@ + } + + dbus_message_iter_get_basic (&iter, &dev_path); +- unescaped_dev_path = nm_dbus_unescape_object_path (dev_path); +- dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path); +- g_free (unescaped_dev_path); ++ dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path); + + /* Ensure the device exists in our list and is supported */ + if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED)) +@@ -448,9 +446,7 @@ + { + NMDevice *dev; + +- dev_path = nm_dbus_unescape_object_path (dev_path); +- +- if ((dev = nm_dbus_get_device_from_object_path (data->data, dev_path))) ++ if ((dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path))) + { + if (nm_device_is_test_device (dev)) + nm_remove_device (data->data, dev); +@@ -463,8 +459,6 @@ + reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound", + "The requested network device does not exist."); + } +- +- g_free (dev_path); + } + else + { +@@ -560,6 +554,7 @@ nm_lock_mutex (app_data->dialup_list_mutex, __FUNCTION__); nm_system_deactivate_all_dialup (app_data->dialup_list); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit Mesa
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package Mesa checked in at Tue May 23 00:59:12 CEST 2006. -------- --- Mesa/Mesa.changes 2006-05-16 16:32:21.000000000 +0200 +++ Mesa/Mesa.changes 2006-05-22 22:31:44.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 22 22:30:52 CEST 2006 - sndirsch(a)suse.de + +- reverted Mesa/MesaGLU split +- fixed libGLcore.so.1 (e.g. soname); required to create a + non-conflicting package for the NVIDIA driver (Bug #175683) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.WHLElx/_old 2006-05-23 00:58:49.000000000 +0200 +++ /var/tmp/diff_new_pack.WHLElx/_new 2006-05-23 00:58:49.000000000 +0200 @@ -20,7 +20,7 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 6.4.2 -Release: 19 +Release: 20 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: Mesa-%{version}.tar.bz2 Source1: missing-headers.tar.bz2 @@ -105,35 +105,6 @@ -------- Brian Paul -%package -n MesaGLU -Summary: Mesa GLU library -Group: System/Libraries -Provides: Mesa:/usr/%{_lib}/libGLU.so.1 xorg-x11-Mesa:/usr/%{_lib}/libGLU.so.1 - -%description -n MesaGLU -Mesa GLU library. - - - -Authors: --------- - Brian Paul - -%package -n MesaGLU-devel -Requires: Mesa-devel = %version -Summary: Libraries, includes and more to develop Mesa/GLU applications -Group: System/Libraries -Provides: Mesa:/usr/%{_lib}/libGLU.so xorg-x11-Mesa:/usr/%{_lib}/libGLU.so - -%description -n MesaGLU-devel -Libraries, includes and more to develop Mesa/GLU applications - - - -Authors: --------- - Brian Paul - %prep %if !%{USE_EXTERNAL_MESA} %setup -n %name -a1 @@ -221,9 +192,10 @@ #%endif # create dummy nvidia libGLcore.so.1 for applications, which are still # linked against libGL.so.1 of older nvidia driver releases -touch libGLcore.c -gcc -Wall -ansi -pedantic -c libGLcore.c -gcc -shared -Wl -o $RPM_BUILD_ROOT/usr/%{_lib}/libGLcore.so.1 libGLcore.o +> libGLcore.c +gcc -Wall -ansi -pedantic -c libGLcore.c -fPIC +ld -shared -soname libGLcore.so.1 -o $RPM_BUILD_ROOT/usr/%{_lib}/libGLcore.so.1.0 libGLcore.o +/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib # duplicate libGL to make workarounds like LD_PRELOAD possible if # nvidia driver is installed and its libGl does not work mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/GL @@ -252,8 +224,7 @@ /usr/include/GL/ %dir /usr/%{_lib}/GL/ /usr/%{_lib}/libGL.so -/usr/%{_lib}/libGL.so.* -/usr/%{_lib}/libGLcore.so.1 +/usr/%{_lib}/lib*.so.* /usr/%{_lib}/GL/lib*.so.* #%ifarch %ix86 #%{_libdir}/libglide3-v3.so @@ -267,25 +238,20 @@ %files devel %defattr(-,root,root) /usr/include/GLES/ +/usr/%{_lib}/libGLU.so +/usr/%{_lib}/libGLw.so +/usr/%{_lib}/libOSMesa.so %files devel-static %defattr(-,root,root) /usr/%{_lib}/libGL.a /usr/%{_lib}/libMesaGL.a -%files -n MesaGLU -%defattr(-,root,root) -/usr/%{_lib}/libGLU.so.* -/usr/%{_lib}/libGLw.so.* -/usr/%{_lib}/libOSMesa.so.* - -%files -n MesaGLU-devel -%defattr(-,root,root) -/usr/%{_lib}/libGLU.so -/usr/%{_lib}/libGLw.so -/usr/%{_lib}/libOSMesa.so - %changelog -n Mesa +* Mon May 22 2006 - sndirsch(a)suse.de +- reverted Mesa/MesaGLU split +- fixed libGLcore.so.1 (e.g. soname); required to create a + non-conflicting package for the NVIDIA driver (Bug #175683) * Tue May 16 2006 - sndirsch(a)suse.de - splitted off MesaGLU/MesaGLU-devel - added ldconfig to %%postun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ogmtools
by root＠suse.de 21 May '06

21 May '06

Hello community, here is the log from the commit of package ogmtools checked in at Mon May 22 01:23:54 CEST 2006. -------- --- ogmtools/ogmtools.changes 2006-01-25 21:38:57.000000000 +0100 +++ ogmtools/ogmtools.changes 2006-05-21 20:41:03.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 21 20:40:25 CEST 2006 - schwab(a)suse.de + +- Fix reading headers. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ogmtools.spec ++++++ --- /var/tmp/diff_new_pack.Msm1Xh/_old 2006-05-22 01:23:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Msm1Xh/_new 2006-05-22 01:23:44.000000000 +0200 @@ -5,16 +5,16 @@ # 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/ # # norootforbuild Name: ogmtools BuildRequires: gcc-c++ libdvdread-devel libvorbis-devel -Summary: Tools for OGG media streams +Summary: Tools for OGG Media Streams Version: 1.5 -Release: 3 +Release: 14 Group: Productivity/Multimedia/Other License: GPL URL: http://www.bunkus.org/videotools/ogmtools/ @@ -23,9 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -These tools allow information about (ogminfo) or extraction from -(ogmdemux) or creation of (ogmmerge) or the splitting of (ogmsplit) OGG -media streams. OGM is used for "OGG media streams". +These tools allow information about (ogminfo), extraction from +(ogmdemux), creation of (ogmmerge), or the division of (ogmsplit) OGG +media streams. OGM stands for OGG media streams. @@ -38,7 +38,7 @@ %patch %build -autoconf +autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ --prefix=/usr --mandir=%{_mandir} make @@ -68,6 +68,8 @@ %{_mandir}/man1/ogmsplit.1.gz %changelog -n ogmtools +* Sun May 21 2006 - schwab(a)suse.de +- Fix reading headers. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - schwab(a)suse.de ++++++ ogmtools-1.5.diff ++++++ --- /var/tmp/diff_new_pack.Msm1Xh/_old 2006-05-22 01:23:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Msm1Xh/_new 2006-05-22 01:23:44.000000000 +0200 @@ -1,3 +1,21 @@ +--- common.c ++++ common.c +@@ -200,7 +200,7 @@ + + #define COPY(m, s) memcpy(&dst->m, &src->m, s) + void copy_headers(stream_header *dst, old_stream_header *src, int size) { +- if (size == sizeof(old_stream_header)) { ++ if (size - 1 == sizeof(old_stream_header)) { + COPY(streamtype[0], 8); + COPY(subtype[0], 4); + COPY(size, 4); +@@ -211,5 +211,5 @@ + COPY(bits_per_sample, 2); + COPY(sh, sizeof(stream_header_video)); + } else +- memcpy(dst, src, size); ++ memcpy(dst, src, sizeof(stream_header)); + } --- configure.in +++ configure.in @@ -31,7 +31,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0