December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit python-gobject2
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package python-gobject2 checked in at Thu Dec 7 21:24:35 CET 2006. -------- --- python-gobject2/python-gobject2.changes 2006-10-21 13:45:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-gobject2/python-gobject2.changes 2006-11-27 19:34:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 27 19:34:34 CET 2006 - sbrabec(a)suse.cz + +- Preamble typo fix. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject2.spec ++++++ --- /var/tmp/diff_new_pack.Mqy0Nh/_old 2006-12-07 21:23:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Mqy0Nh/_new 2006-12-07 21:23:27.000000000 +0100 @@ -11,10 +11,10 @@ # norootforbuild Name: python-gobject2 -Buildrequires: python-devel glib2-devel +BuildRequires: glib2-devel python-devel Summary: Python bindings for GObject Version: 2.12.2 -Release: 1 +Release: 11 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/Python URL: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ @@ -82,6 +82,8 @@ %{_datadir}/gtk-doc %changelog -n python-gobject2 +* Mon Nov 27 2006 - sbrabec(a)suse.cz +- Preamble typo fix. * Sat Oct 21 2006 - cthiel(a)suse.de - update to version 2.12.2 * Make PyGObject 64-bit safe for Python 2.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-gnome-extras
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package python-gnome-extras checked in at Thu Dec 7 21:23:52 CET 2006. -------- --- python-gnome-extras/python-gnome-extras.changes 2006-08-17 11:51:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-gnome-extras/python-gnome-extras.changes 2006-12-04 18:57:20.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 18:49:20 CET 2006 - jhargadon(a)suse.de + +- added mozilla-xulrunner to BuildRequires to enable gtkmozembed + (#224800) +- removed unused BuildRequires +- removed gksu module (#225388) +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gnome-extras.spec ++++++ --- /var/tmp/diff_new_pack.E8elie/_old 2006-12-07 21:23:23.000000000 +0100 +++ /var/tmp/diff_new_pack.E8elie/_new 2006-12-07 21:23:23.000000000 +0100 @@ -11,17 +11,20 @@ # norootforbuild Name: python-gnome-extras -BuildRequires: eel-devel gnome-panel-devel gnutls-devel gtksourceview-devel gtkspell-devel libgda-devel libgnomeprintui-devel libgtkhtml-devel libgtop-devel libstdc++-devel libwnck-devel mDNSResponder-devel nautilus-cd-burner-devel nautilus-devel python-devel python-gnome-devel totem update-desktop-files +%define geckoversion 181 +BuildRequires: gtkspell-devel libgtkhtml-devel libstdc++-devel python-devel python-gnome-devel update-desktop-files +BuildRequires: mozilla-xulrunner%{geckoversion}-devel URL: ftp://ftp.gnome.org/pub/gnome/sources/gnome-python-extras Summary: Python bindings for GNOME Version: 2.14.2 -Release: 2 +Release: 35 Source: gnome-python-extras-%{version}.tar.bz2 -License: GPL, LGPL +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} Requires: python-gnome python-gtk python-numeric python-orbit +Requires: mozilla-xulrunner%{geckoversion} %description GNOME-python-extras is an extension module for python that gives you @@ -60,6 +63,7 @@ done mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/ mv $RPM_BUILD_ROOT/usr/share/gtk-doc $RPM_BUILD_ROOT/opt/gnome/share/gtk-doc +rm -rf $RPM_BUILD_ROOT/%{py_sitedir}/gtk-2.0/gksu %files %defattr(644, root, root, 755) @@ -72,6 +76,11 @@ /opt/gnome/share/gtk-doc/html/pygtkspell %changelog -n python-gnome-extras +* Mon Dec 04 2006 - jhargadon(a)suse.de +- added mozilla-xulrunner to BuildRequires to enable gtkmozembed + (#224800) +- removed unused BuildRequires +- removed gksu module (#225388) * Thu Aug 17 2006 - cthiel(a)suse.de - fix build * Wed Aug 16 2006 - cthiel(a)suse.de @@ -84,14 +93,14 @@ * Fixed some crashes due to missing parameter type checking - Overview of Changes from 2.13.2 to 2.13.3 * The following modules moved to the package gnome-python-desktop: -- gnomeapplet -- gnomeprint, gnomeprint.ui -- gtksourceview -- wnck -- totem.plparser -- gtop -- nautilusburn -- mediaprofiles + - gnomeapplet + - gnomeprint, gnomeprint.ui + - gtksourceview + - wnck + - totem.plparser + - gtop + - nautilusburn + - mediaprofiles * Correct a typo in pygda-1.2.pc - Overview of Changes from 2.13.1 to 2.13.2 * Wrap panel_applet_set_background_widget ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-gnome
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package python-gnome checked in at Thu Dec 7 21:23:22 CET 2006. -------- --- GNOME/python-gnome/python-gnome.changes 2006-11-14 18:00:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-gnome/python-gnome.changes 2006-11-30 16:26:31.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 30 16:25:56 CET 2006 - sbrabec(a)suse.cz + +- Do not apply Py_ssize_t patch for older products. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gnome.spec ++++++ --- /var/tmp/diff_new_pack.uCQQFI/_old 2006-12-07 21:23:12.000000000 +0100 +++ /var/tmp/diff_new_pack.uCQQFI/_new 2006-12-07 21:23:12.000000000 +0100 @@ -15,7 +15,7 @@ URL: ftp://ftp.gnome.org/pub/gnome/sources/gnome-python Summary: Python bindings for GNOME Version: 2.16.0 -Release: 10 +Release: 15 Source: gnome-python-%{version}.tar.bz2 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/Python @@ -59,7 +59,9 @@ %prep %setup -q -n gnome-python-%{version} #%%patch -p1 +%if %suse_version > 1010 %patch1 +%endif %patch2 %build @@ -92,6 +94,8 @@ %{_includedir}/gnome-python-2.0 %changelog -n python-gnome +* Thu Nov 30 2006 - sbrabec(a)suse.cz +- Do not apply Py_ssize_t patch for older products. * Tue Nov 14 2006 - jhargadon(a)suse.de - applied a patch to resolve inconsistent use of tabs and spaces mentioned in bug #220318 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pwdutils
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package pwdutils checked in at Thu Dec 7 21:23:17 CET 2006. -------- --- pwdutils/pwdutils.changes 2006-11-29 18:24:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/pwdutils/pwdutils.changes 2006-11-30 14:41:06.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 30 14:40:45 CET 2006 - kukuk(a)suse.de + +- Update to pwdutils 3.1.3 (update of swedish translation) + +------------------------------------------------------------------- Old: ---- pwdutils-3.1.2-nodebug.diff pwdutils-3.1.2.tar.bz2 New: ---- pwdutils-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwdutils.spec ++++++ --- /var/tmp/diff_new_pack.0pfN2m/_old 2006-12-07 21:22:57.000000000 +0100 +++ /var/tmp/diff_new_pack.0pfN2m/_new 2006-12-07 21:22:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pwdutils (Version 3.1.2) +# spec file for package pwdutils (Version 3.1.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on -Version: 3.1.2 -Release: 11 +Version: 3.1.3 +Release: 1 Summary: Utilities to Manage User and Group Accounts PreReq: grep /bin/cp /bin/mv Requires: pam-modules @@ -28,7 +28,6 @@ Source2: ldap.conf Source3: useradd.default Source4: login.pamd -Patch: pwdutils-3.1.2-nodebug.diff Patch2: bugzilla-148065.patch Patch4: pam_login-3.31.diff Patch5: pam_login-3.31-suppress_hostname.patch @@ -58,7 +57,6 @@ %prep %setup -q -b 1 -%patch pushd ../pam_login-* %patch2 -p0 %patch4 @@ -193,6 +191,8 @@ %{_libdir}/pwdutils/liblog_audit.so.1* %changelog -n pwdutils +* Thu Nov 30 2006 - kukuk(a)suse.de +- Update to pwdutils 3.1.3 (update of swedish translation) * Wed Nov 29 2006 - kukuk(a)suse.de - Remove debug output of newgrp/sg. * Mon Oct 23 2006 - kukuk(a)suse.de ++++++ pwdutils-3.1.2.tar.bz2 -> pwdutils-3.1.3.tar.bz2 ++++++ ++++ 21242 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pure-ftpd
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package pure-ftpd checked in at Thu Dec 7 21:23:07 CET 2006. -------- --- pure-ftpd/pure-ftpd.changes 2006-09-06 14:37:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/pure-ftpd/pure-ftpd.changes 2006-12-06 12:48:37.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 6 12:48:34 CET 2006 - mskibbe(a)suse.de + +- add service xml document (fate #301713 ) + +------------------------------------------------------------------- New: ---- pure-ftpd.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.TX0ulf/_old 2006-12-07 21:22:49.000000000 +0100 +++ /var/tmp/diff_new_pack.TX0ulf/_new 2006-12-07 21:22:49.000000000 +0100 @@ -13,19 +13,20 @@ Name: pure-ftpd BuildRequires: mysql-devel openldap2-devel pam-devel postgresql-devel Version: 1.0.21 -Release: 5 +Release: 23 URL: http://www.pureftpd.org Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.xinetd +Source4: %{name}.xml Patch: %{name}-1.0.20_config.patch Patch1: %{name}-1.0.20_doc.patch Patch2: %{name}-1.0.20_virtualhosts.patch Patch4: pure-ftpd-1.0.20_config_minuid.patch Patch5: pure-ftpd-1.0.20_ftpwho_path.patch Group: Productivity/Networking/Ftp/Servers -License: BSD +License: BSD License and BSD-like Provides: ftp-server pureftpd PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,6 +96,8 @@ %{__install} -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/pure-ftpd %{__install} -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/xinetd.d/pure-ftpd %{__install} -m 0644 pureftpd.schema %{buildroot}%{_sysconfdir}/openldap/schema/ +%{__install} -d %{buildroot}%{_sysconfdir}/omc/svcinfo.d/ +%{__install} -m 0644 %{S:4} %{buildroot}%{_sysconfdir}/omc/svcinfo.d/ %clean %{__rm} -rf "%{buildroot}" @@ -113,6 +116,9 @@ %files %defattr(-, root, root) +%dir %{_sysconfdir}/omc/ +%dir %{_sysconfdir}/omc/svcinfo.d/ +%{_sysconfdir}/omc/svcinfo.d/%name.xml %doc AUTHORS CONTACT COPYING NEWS THANKS README README.Contrib %doc README.Configuration-File HISTORY README.Netfilter README.Virtual-Users %doc README.LDAP pureftpd-ldap.conf README.MySQL README.PGSQL README.TLS @@ -130,6 +136,8 @@ %config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %changelog -n pure-ftpd +* Wed Dec 06 2006 - mskibbe(a)suse.de +- add service xml document (fate #301713 ) * Wed Sep 06 2006 - mskibbe(a)suse.de - fix bug Bug 203798 - Restarting the ftp server using the "rcpure-ftpd stop/start" doesn't stop/kill the existing @@ -150,7 +158,7 @@ o OPTS MLST has been implemented o SITE UTIME has been implemented o TCP_CORK is on by default again. A new configure switch, ---without-cork, can disable it + --without-cork, can disable it o Correctly format %%c and %% in fakesprintf() o The connection socket is now created with the Nagle algorithm disabled. It was the trick to dramatically improve performance ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package pm-utils checked in at Thu Dec 7 21:22:51 CET 2006. -------- --- pm-utils/pm-utils.changes 2006-11-22 17:21:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2006-12-05 18:21:18.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Dec 5 18:06:13 CET 2006 - seife(a)suse.de + +- fix 30s2disk-check hook, so that suspend with the kernel method + works again (fixes bug 226115) + +------------------------------------------------------------------- +Thu Nov 30 21:07:40 CET 2006 - seife(a)suse.de + +- fix on_ac_power on desktops with battery powered mice + (bug 221999) +- make running the hooks slightly more verbose + +------------------------------------------------------------------- New: ---- pm-utils-fix-on_ac_power-bug221999.diff pm-utils-make-hooks-verbose.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.6NsTnv/_old 2006-12-07 21:22:38.000000000 +0100 +++ /var/tmp/diff_new_pack.6NsTnv/_new 2006-12-07 21:22:38.000000000 +0100 @@ -13,7 +13,7 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ Version: 0.20.0.20061114 -Release: 3 +Release: 5 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) Group: System/Base @@ -22,6 +22,8 @@ Patch1: pm-utils-fix-source-configs.diff Patch2: pm-utils-uswsusp-support.diff Patch3: pm-utils-comment-configfile.diff +Patch5: pm-utils-make-hooks-verbose.diff +Patch4: pm-utils-fix-on_ac_power-bug221999.diff Source1: pm-utils-suse.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr @@ -46,6 +48,8 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 +%patch5 -p0 %patch0 -p0 %build @@ -74,6 +78,13 @@ %doc README COPYING ChangeLog AUTHORS %changelog -n pm-utils +* Tue Dec 05 2006 - seife(a)suse.de +- fix 30s2disk-check hook, so that suspend with the kernel method + works again (fixes bug 226115) +* Thu Nov 30 2006 - seife(a)suse.de +- fix on_ac_power on desktops with battery powered mice + (bug 221999) +- make running the hooks slightly more verbose * Wed Nov 22 2006 - seife(a)suse.de - fix dualcore cpufreq problem after suspend (bug 223164) - mark the configfile as "noreplace" ++++++ pm-utils-fix-on_ac_power-bug221999.diff ++++++ --- src/on_ac_power +++ src/on_ac_power @@ -29,13 +29,17 @@ # # Check for AC/DC/etc adapters -for device in $(hal-find-by-capability --capability ac_adapter) ; do +ac_adapters=$(hal-find-by-capability --capability ac_adapter) + +# If there are no ac_adapters, it is most likely a desktop. +# assume online +[ -z "$ac_adapters" ] && exit 0 + +# Check if all $ac_adapters are not present +for device in $ac_adapters ; do present=$(hal-get-property --udi $device --key ac_adapter.present) [ "$present" == "true" ] && exit 0 done -# If there are no ac_adapters, check for batteries. -hal-find-by-capability --capability battery >/dev/null 2>&1 && exit 1 - -# If there are no batteries assume AC. -exit 0 +# If none of them were present, ret will be 1, signalling "not on AC power" +exit 1 ++++++ pm-utils-make-hooks-verbose.diff ++++++ Index: pm/functions =================================================================== RCS file: /cvs/pm-utils/pm-utils/pm/functions,v retrieving revision 1.30 diff -u -p -r1.30 functions --- pm/functions 14 Nov 2006 16:01:30 -0000 1.30 +++ pm/functions 28 Nov 2006 20:23:57 -0000 @@ -99,6 +99,8 @@ run_hooks() fi done fi + + echo "$(date): finished $1 hooks." } get_power_status() @@ -214,7 +216,7 @@ stopservice() service "$1" status 2>/dev/null | grep -c -q running if [ "$?" == "0" -a -x "/etc/init.d/$1" ]; then echo "export ${1}_SERVICE_ACTIVATE=yes" >> /var/run/pm-suspend - "/etc/init.d/$1" stop >/dev/null 2>&1 + "/etc/init.d/$1" stop 2>&1 fi } @@ -222,7 +224,7 @@ restartservice() { if [ "x$(eval echo \$${1}_SERVICE_ACTIVATE)" == "xyes" \ -a -x "/etc/init.d/$1" ]; then - "/etc/init.d/$1" start >/dev/null 2>&1 + "/etc/init.d/$1" start 2>&1 fi } ++++++ pm-utils-suse.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/30s2disk-check new/pm-utils-suse/hooks/30s2disk-check --- old/pm-utils-suse/hooks/30s2disk-check 2006-11-08 13:45:07.000000000 +0100 +++ new/pm-utils-suse/hooks/30s2disk-check 2006-12-05 17:52:45.000000000 +0100 @@ -53,7 +53,7 @@ return 1 fi X=$(stat -Lc '$((0x%t)):$((0x%T))' $RESUME) - RDEV=$(echo $X) + RDEV=$(eval echo $X) if [ "$DEV" != "$RDEV" ]; then echo "ERROR: /sys/power/resume ($DEV) disagrees with resume= parameter ($RDEV)" echo " can not suspend." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit planner
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package planner checked in at Thu Dec 7 21:22:41 CET 2006. -------- --- GNOME/planner/planner.changes 2006-11-09 21:57:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/planner/planner.changes 2006-12-04 21:57:13.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 4 21:56:46 CET 2006 - jhargadon(a)suse.de + +- removed unneeded files (#225778) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ planner.spec ++++++ --- /var/tmp/diff_new_pack.7G0CBb/_old 2006-12-07 21:22:27.000000000 +0100 +++ /var/tmp/diff_new_pack.7G0CBb/_new 2006-12-07 21:22:27.000000000 +0100 @@ -15,7 +15,7 @@ URL: http://live.gnome.org/Planner %define prefix /opt/gnome %define my_requires /tmp/planner-requires -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Office/Organizers Obsoletes: mrproject Provides: mrproject @@ -24,7 +24,7 @@ PreReq: shared-mime-info /bin/ln Summary: Project Management Application for GNOME Version: 0.14.1 -Release: 14 +Release: 22 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}… Patch1: planner-desktop.patch Patch2: planner-evolution.patch @@ -151,6 +151,8 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires} cp $RPM_BUILD_ROOT%{prefix}/%{_lib}/planner/plugins/libeds-plugin.so $RPM_BUILD_ROOT%{prefix}/%{_lib}/planner/plugins/libeds-plugin.so.opt +rm $RPM_BUILD_ROOT/usr/%{_lib}/python2.5/site-packages/planner.la +rm $RPM_BUILD_ROOT/usr/%{_lib}/python2.5/site-packages/plannerui.la %post usr/bin/update-mime-database %{prefix}/share/mime >/dev/null @@ -214,9 +216,10 @@ %{prefix}/share/gtk-doc/html/libplanner %{prefix}/%{_lib}/*.so %{prefix}/%{_lib}/*.la -/usr/%{_lib}/python2.?/site-packages/*.la %changelog -n planner +* Mon Dec 04 2006 - jhargadon(a)suse.de +- removed unneeded files (#225778) * Thu Nov 09 2006 - jhargadon(a)suse.de - added "intltoolize --copy --force --automake" to the specfile so fix a problem with translations. (219388) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package phpMyAdmin checked in at Thu Dec 7 21:22:21 CET 2006. -------- --- phpMyAdmin/phpMyAdmin.changes 2006-11-23 17:10:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2006-12-01 22:50:15.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 1 22:48:15 CET 2006 - mmarek(a)suse.cz + +- fix previous update which wrongly moved the config.inc.php + file to the libraries subdirectory [#223721] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.NkuoUK/_old 2006-12-07 21:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.NkuoUK/_new 2006-12-07 21:21:07.000000000 +0100 @@ -17,7 +17,7 @@ Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session apache2 php5-mbstring Autoreqprov: on Version: 2.9.1.1 -Release: 1 +Release: 3 Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: phpmyadmin.conf Patch1: %{name}-%{version}-blowfish_secret.patch @@ -75,9 +75,9 @@ %install install -m 755 -d $RPM_BUILD_ROOT%{serverroot}%{name} -cp libraries/config.default.php libraries/config.inc.php cp -dR docs.css *.php *.html themes lang libraries css js \ $RPM_BUILD_ROOT%{serverroot}%{name} +touch $RPM_BUILD_ROOT%{serverroot}%{name}/config.inc.php # generate file list find $RPM_BUILD_ROOT%{serverroot}%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST @@ -88,36 +88,18 @@ rm -rf $RPM_BUILD_ROOT %post -old_config="%{serverroot}%{name}/config.inc.php" -new_config="%{serverroot}%{name}/libraries/config.inc.php" -blowfish_secret="%{serverroot}%{name}/libraries/blowfish_secret.inc.php" -# handle upgrade from a version that had /config.inc.php (<=10.0) -# now it's /libraries/config.inc.php (>=10.1) -if test -f "$old_config"; then - echo "phpMyAdmin's config file location has changed from " >&2 - echo "$old_config to" >&2 - echo "$new_config" >&2 - echo "it will be automatically moved" >&2 - # emulate rpm behaviour when upgrading a %%config(noreplace) file - mv -f "$new_config" "$new_config.rpmnew" - mv -f "$old_config" "$new_config" -fi # generate blowfish secret -# in <=10.0, this used to be directly in config.inc.php, -# which made it hard to detect whether the file was changed by the user or not -if grep -q "\\\$cfg\['blowfish_secret'\]" "$new_config" ; then - # if this is an upgrade from <=10.0, move the secret - # to blowfish_secret.inc.php - # this is hopefully the last time we change this config file in %%post - (echo "<?php" - grep "\\\$cfg\['blowfish_secret'\]" "$new_config" - echo "?>") >"$blowfish_secret" - sed -i "s/.*\\\$cfg\['blowfish_secret'\].*/include_once 'blowfish_secret.inc.php';/" "$new_config" -fi +blowfish_secret="%{serverroot}%{name}/libraries/blowfish_secret.inc.php" if grep -q "\\\$cfg\['blowfish_secret'\] = ''" "$blowfish_secret" ; then echo "Generating blowfish secret for phpMyAdmin..." sed -i "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" "$blowfish_secret" fi +# workaround for https://bugzilla.novell.com/show_bug.cgi?id=223725 +# we (wrongly) moved the config to libraries/ +if test -f %{serverroot}%{name}/libraries/config.inc.php -a ! \ + -f %{serverroot}%{name}/config.inc.php; then + mv %{serverroot}%{name}/libraries/config.inc.php %{serverroot}%{name}/ +fi %files -f FILELIST %defattr(-, root, root) @@ -125,11 +107,16 @@ %doc LICENSE README RELEASE-DATE* TODO translators.html %doc scripts/*.sql %dir %{serverroot}%{name} -%config(noreplace) %{serverroot}%{name}/libraries/config.inc.php %attr(0640, wwwrun, www) %verify(not md5 size mtime) %config(noreplace) %{serverroot}%{name}/libraries/blowfish_secret.inc.php %config(noreplace) /etc/apache2/conf.d/phpmyadmin.conf +# we don't need to install config.inc.php, but we have to keep it +# in the filelist so that an update doesn't delete it +%ghost %{serverroot}%{name}/config.inc.php %changelog -n phpMyAdmin +* Fri Dec 01 2006 - mmarek(a)suse.cz +- fix previous update which wrongly moved the config.inc.php + file to the libraries subdirectory [#223721] * Thu Nov 23 2006 - anosek(a)suse.cz - security update to version 2.9.1.1 [#222594] [#222622] * Wed Nov 08 2006 - anosek(a)suse.cz ++++++ phpMyAdmin-2.9.1.1-blowfish_secret.patch ++++++ --- /var/tmp/diff_new_pack.NkuoUK/_old 2006-12-07 21:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.NkuoUK/_new 2006-12-07 21:21:07.000000000 +0100 @@ -1,11 +1,11 @@ --- libraries/config.default.php +++ libraries/config.default.php -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ $cfg['PmaNoRelation_DisableWarning'] = * passphrase that will be used by blowfish. The maximum length seems to be 46 * characters. */ -$cfg['blowfish_secret'] = ''; -+include_once 'blowfish_secret.inc.php'; ++include_once './libraries/blowfish_secret.inc.php'; /** * Server(s) configuration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Crypt-CBC
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package perl-Crypt-CBC checked in at Thu Dec 7 21:21:27 CET 2006. -------- --- perl-Crypt-CBC/perl-Crypt-CBC.changes 2006-09-15 19:45:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Crypt-CBC/perl-Crypt-CBC.changes 2006-10-19 17:08:29.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 19 16:58:09 CEST 2006 - anicka(a)suse.cz + +- update to 2.21 +* Fixed bug in which new() failed to work when first option is + -literal_key. +* Added ability to pass a preinitialized Crypt::* block cipher + object instead of the class name. + +------------------------------------------------------------------- Old: ---- Crypt-CBC-2.19.tar.bz2 New: ---- Crypt-CBC-2.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Crypt-CBC.spec ++++++ --- /var/tmp/diff_new_pack.eagCfz/_old 2006-12-07 21:21:09.000000000 +0100 +++ /var/tmp/diff_new_pack.eagCfz/_new 2006-12-07 21:21:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Crypt-CBC (Version 2.19) +# spec file for package perl-Crypt-CBC (Version 2.21) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,8 +13,8 @@ Name: perl-Crypt-CBC URL: http://cpan.org/modules/by-module/Crypt/ BuildRequires: perl-Crypt-Blowfish perl-Crypt-DES -Version: 2.19 -Release: 1 +Version: 2.21 +Release: 2 Requires: perl-Crypt-Blowfish perl-Crypt-DES Requires: perl = %{perl_version} Autoreqprov: on @@ -55,6 +55,12 @@ /var/adm/perl-modules/%{name} %changelog -n perl-Crypt-CBC +* Thu Oct 19 2006 - anicka(a)suse.cz +- update to 2.21 + * Fixed bug in which new() failed to work when first option is + -literal_key. + * Added ability to pass a preinitialized Crypt::* block cipher + object instead of the class name. * Thu Sep 14 2006 - anicka(a)suse.cz - update to 2.19 * Renamed Crypt::CBC-2.16-vulnerability.txt so that ++++++ Crypt-CBC-2.19.tar.bz2 -> Crypt-CBC-2.21.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/CBC.pm new/Crypt-CBC-2.21/CBC.pm --- old/Crypt-CBC-2.19/CBC.pm 2006-08-12 21:49:12.000000000 +0200 +++ new/Crypt-CBC-2.21/CBC.pm 2006-10-17 01:26:17.000000000 +0200 @@ -4,7 +4,7 @@ use Carp; use strict; use vars qw($VERSION); -$VERSION = '2.19'; +$VERSION = '2.21'; use constant RANDOM_DEVICE => '/dev/urandom'; @@ -19,7 +19,7 @@ } # CGI style arguments - elsif ($_[0] =~ /^-[a-zA-Z]{1,20}$/) { + elsif ($_[0] =~ /^-[a-zA-Z_]{1,20}$/) { my %tmp = @_; while ( my($key,$value) = each %tmp) { $key =~ s/^-//; @@ -32,10 +32,20 @@ $options->{cipher} = shift; } + my $cipher_object_provided = $options->{cipher} && ref $options->{cipher}; + # "key" is a misnomer here, because it is actually usually a passphrase that is used # to derive the true key my $pass = $options->{key}; - croak "Please provide an encryption/decryption passphrase or key using -key" unless defined $pass; + + if ($cipher_object_provided) { + carp "Both a key and a pre-initialized Crypt::* object were passed. The key will be ignored" + if defined $pass; + $pass ||= ''; + } + elsif (!defined $pass) { + croak "Please provide an encryption/decryption passphrase or key using -key" + } # header mode my %valid_modes = map {$_=>1} qw(none salt randomiv); @@ -50,11 +60,14 @@ my $cipher = $options->{cipher}; $cipher = 'Crypt::DES' unless $cipher; - $cipher = $cipher=~/^Crypt::/ ? $cipher : "Crypt::$cipher"; - $cipher->can('encrypt') or eval "require $cipher; 1" or croak "Couldn't load $cipher: $@"; + my $cipherclass = ref $cipher || $cipher; - # some crypt modules use the class Crypt::, and others don't - $cipher =~ s/^Crypt::// unless $cipher->can('keysize'); + unless (ref $cipher) { # munge the class name if no object passed + $cipher = $cipher=~/^Crypt::/ ? $cipher : "Crypt::$cipher"; + $cipher->can('encrypt') or eval "require $cipher; 1" or croak "Couldn't load $cipher: $@"; + # some crypt modules use the class Crypt::, and others don't + $cipher =~ s/^Crypt::// unless $cipher->can('keysize'); + } # allow user to override these values my $ks = $options->{keysize}; @@ -68,7 +81,7 @@ # keysize (well, Crypt::Blowfish in any case). If we detect # this, and find the blowfish module in use, then assume 56. # Otherwise assume the least common denominator of 8. - $ks ||= $cipher =~ /blowfish/i ? 56 : 8; + $ks ||= $cipherclass =~ /blowfish/i ? 56 : 8; $bs ||= $ks; my $pcbc = $options->{'pcbc'}; @@ -88,7 +101,7 @@ # note: iv will be autogenerated by start() if not specified in options my $iv = $options->{iv}; my $random_iv = 1 unless defined $iv; - croak "Initialization vector must be exactly $bs bytes long when using the $cipher cipher" if defined $iv and length($iv) != $bs; + croak "Initialization vector must be exactly $bs bytes long when using the $cipherclass cipher" if defined $iv and length($iv) != $bs; my $legacy_hack = $options->{insecure_legacy_decrypt}; my $padding = $options->{padding} || 'standard'; @@ -306,9 +319,9 @@ unless $self->{key} && $self->{civ}; # now we can generate the crypt object itself - $self->{crypt} = $self->{cipher}->new($self->{key}) - or croak "Could not create $self->{cipher} object: $@"; - + $self->{crypt} = ref $self->{cipher} ? $self->{cipher} + : $self->{cipher}->new($self->{key}) + or croak "Could not create $self->{cipher} object: $@"; return ''; } @@ -348,9 +361,9 @@ croak "key and/or iv are missing" unless defined $self->{key} && defined $self->{civ}; - $self->{crypt} = $self->{cipher}->new($self->{key}) - or croak "Could not create $self->{cipher} object: $@"; - + $self->{crypt} = ref $self->{cipher} ? $self->{cipher} + : $self->{cipher}->new($self->{key}) + or croak "Could not create $self->{cipher} object: $@"; return $result; } @@ -587,7 +600,8 @@ -key The encryption/decryption key (required) - -cipher The cipher algorithm (defaults to Crypt::DES) + -cipher The cipher algorithm (defaults to Crypt::DES), or + a preexisting cipher object. -salt Enables OpenSSL-compatibility. If equal to a value of "1" then causes a random salt to be generated @@ -659,6 +673,14 @@ Crypt::CAST5 and Crypt::Rijndael. You may refer to them using their full names ("Crypt::IDEA") or in abbreviated form ("IDEA"). +Instead of passing the name of a cipher class, you may pass an +already-created block cipher object. This allows you to take advantage +of cipher algorithms that have parameterized new() methods, such as +Crypt::Eksblowfish: + + my $eksblowfish = Crypt::Eksblowfish->new(8,$salt,$key); + my $cbc = Crypt::CBC->new(-cipher=>$eksblowfish); + The B<-key> argument provides either a passphrase to use to generate the encryption key, or the literal value of the block cipher key. If used in passphrase mode (which is the default), B<-key> can be any @@ -670,6 +692,9 @@ B<-literal_key> option. In this case, you should choose a key of length exactly equal to the cipher's key length. +If you pass an existing Crypt::* object to new(), then the -key +argument is ignored and the module will generate a warning. + The B<-header> argument specifies what type of header, if any, to prepend to the beginning of the encrypted data stream. The header allows Crypt::CBC to regenerate the original IV and correctly decrypt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/Changes new/Crypt-CBC-2.21/Changes --- old/Crypt-CBC-2.19/Changes 2006-08-12 21:49:12.000000000 +0200 +++ new/Crypt-CBC-2.21/Changes 2006-10-17 01:26:51.000000000 +0200 @@ -1,4 +1,11 @@ Revision history for Perl extension Crypt::CBC. +2.21 Mon Oct 16 19:26:26 EDT 2006 + - Fixed bug in which new() failed to work when first option is -literal_key. + +2.20 Sat Aug 12 22:30:53 EDT 2006 + - Added ability to pass a preinitialized Crypt::* block cipher object instead of + the class name. + 2.19 Tue Jul 18 18:39:57 EDT 2006 - Renamed Crypt::CBC-2.16-vulnerability.txt so that package installs correctly under Cygwin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/MANIFEST new/Crypt-CBC-2.21/MANIFEST --- old/Crypt-CBC-2.19/MANIFEST 2006-08-12 21:50:00.000000000 +0200 +++ new/Crypt-CBC-2.21/MANIFEST 2006-08-13 04:32:38.000000000 +0200 @@ -4,6 +4,7 @@ META.yml Module meta-data (added by MakeMaker) Makefile.PL README +README.compatibility Crypt-CBC-2.16-vulnerability.txt eg/aes.pl eg/des.pl @@ -19,4 +20,5 @@ t/func.t t/null_data.t t/parameters.t +t/preexisting.t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/META.yml new/Crypt-CBC-2.21/META.yml --- old/Crypt-CBC-2.19/META.yml 2006-08-12 21:50:09.000000000 +0200 +++ new/Crypt-CBC-2.21/META.yml 2006-10-17 01:39:10.000000000 +0200 @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Crypt-CBC -version: 2.19 +version: 2.21 version_from: CBC.pm installdirs: site requires: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/README.compatibility new/Crypt-CBC-2.21/README.compatibility --- old/Crypt-CBC-2.19/README.compatibility 1970-01-01 01:00:00.000000000 +0100 +++ new/Crypt-CBC-2.21/README.compatibility 2006-06-07 01:15:10.000000000 +0200 @@ -0,0 +1,44 @@ +Compatibility Notes +------------------- + +Crypt::CBC version 2.17 and higher contains changes designed to make +encrypted messages more secure. In particular, Crypt::CBC now works +correctly with ciphers that use block sizes greater than 8 bytes, +which includes Rijndael, the basis for the AES encryption system. It +also interoperates seamlessly with the OpenSSL library. Unfortunately, +these changes break compatibility with messages encrypted with +versions 2.16 and lower. + +To successfully decrypt messages encrypted with Crypt::CBC 2.16 and +lower, follow these steps: + +1) Pass Crypt::CBC->new() the option -header=>'randomiv'. Example: + + my $cbc = Crypt::CBC->new(-key => $key, + -cipher => 'Blowfish', + -header => 'randomiv'); + +This tells Crypt::CBC to decrypt messages using the legacy "randomiv" +style header rather than the default SSL-compatible "salt" style +header. + +2) If the legacy messages were encrypted using Rijndael, also pass +Crypt::CBC the -insecure_legacy_decrypt=>1 option: + + my $cbc = Crypt::CBC->new(-key => $key, + -cipher => 'Rijndael', + -header => 'randomiv', + -insecure_legacy_decrypt => 1 ); + + +This tells Crypt::CBC to allow you to decrypt Rijndael messages that +were incorrectly encrypted by pre-2.17 versions. It is important to +realize that Rijndael messages encrypted by version 2.16 and lower +*ARE NOT SECURE*. New versions of Crypt::CBC will refuse to encrypt +Rijndael messages in a way that is backward compatible with 2.16 and +lower. + +I apologize for any inconvenience this causes. + +Lincoln Stein +Spring 2006 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-CBC-2.19/t/preexisting.t new/Crypt-CBC-2.21/t/preexisting.t --- old/Crypt-CBC-2.19/t/preexisting.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Crypt-CBC-2.21/t/preexisting.t 2006-08-13 04:24:16.000000000 +0200 @@ -0,0 +1,77 @@ +#!/usr/local/bin/perl + +use strict; +use lib '..','../blib/lib','.','./blib/lib'; + +my (@mods,$cipherclass,$i,$c,$p,$test_data); + +@mods = qw/Eksblowfish + Rijndael + Blowfish + Blowfish_PP + IDEA + DES + /; + +for my $mod (@mods) { + if (eval "use Crypt::$mod(); 1") { + $cipherclass = "Crypt::$mod"; + warn "Using $cipherclass for test\n"; + last; + } +} + +unless ($cipherclass) { + print "1..0 # Skipped: No cryptographic module suitable for testing\n"; + exit; +} + +print "1..33\n"; + +sub test { + local($^W) = 0; + my($num, $true,$msg) = @_; + print($true ? "ok $num\n" : "not ok $num $msg\n"); +} + +$test_data = <<END; +Mary had a little lamb, +Its fleece was black as coal, +And everywere that Mary went, +That lamb would dig a hole. +END + ; + +eval "use Crypt::CBC"; + +test(1,!$@,"Couldn't load module"); +my $bs = eval{$cipherclass->blocksize} || 8; +my $ks = eval{$cipherclass->keysize} || $bs; + +my $key = Crypt::CBC->_get_random_bytes($ks); +my $cipher = $cipherclass eq 'Crypt::Eksblowfish' ? $cipherclass->new(8,Crypt::CBC->_get_random_bytes(16),$key) : $cipherclass->new($key); + +test(2,$i = Crypt::CBC->new(-cipher=>$cipher),"Couldn't create new object"); +test(3,$c = $i->encrypt($test_data),"Couldn't encrypt"); +test(4,$p = $i->decrypt($c),"Couldn't decrypt"); +test(5,$p eq $test_data,"Decrypted ciphertext doesn't match plaintext"); + +# now try various truncations of the whole +for (my $c=1;$c<=7;$c++) { + substr($test_data,-$c) = ''; # truncate + test(5+$c,$i->decrypt($i->encrypt($test_data)) eq $test_data); +} + +# now try various short strings +for (my $c=0;$c<=18;$c++) { + $test_data = 'i' x $c; + test (13+$c,$i->decrypt($i->encrypt($test_data)) eq $test_data); +} + + +# make sure that strings that end in spaces or nulls are treated correctly +$test_data = "This string ends in a null\0"; +test (32,$i->decrypt($i->encrypt($test_data)) eq $test_data); + +$test_data = "This string ends in some spaces "; +test (33,$i->decrypt($i->encrypt($test_data)) eq $test_data); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package php5 checked in at Thu Dec 7 21:21:23 CET 2006. -------- --- php5/php5.changes 2006-11-08 15:18:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2006-12-06 16:54:53.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Dec 6 16:42:52 CET 2006 - anosek(a)suse.cz + +- synced with BuildService + * updated Suhosin patch to 0.9.6.2 + * updated Suhosin extension to 0.9.16 + * fixed php5-devel should provide PECL tool [#204006] + * use bundled sqlite in suse versions =< 10.1 + (pdo_sqlite stopped working properly with older sqlite3 libs) + * do not use zend-multibyte anymore, please refer + to phpbug #36711 and associated links, no applications uses + this feature in the real world since it is disabled + in all other distributions/OS.seems to cause more problems + than solutions. + * change php.ini, back to short_open_tag =off (the default) + the package that depended on this setting no longer does. + Also explicitely set the upload_tmp_dir in php.ini to deal + with open_basedir recent changes (please refer + to phpbug #39123) for the details. + * suhosin.ini uses just the default recommended settings + +------------------------------------------------------------------- Old: ---- suhosin-0.9.10.tar.bz2 suhosin-patch-5.2.0-0.9.6.1.patch.gz New: ---- README.SUSE-pear suhosin-0.9.16.tar.bz2 suhosin-patch-5.2.0-0.9.6.2.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:43.000000000 +0100 +++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:43.000000000 +0100 @@ -11,7 +11,9 @@ # norootforbuild Name: php5 -%define suhosin_version 0.9.10 +%define suhosin_version 0.9.16 +%define suhosin_patch_version 0.9.6.2 +%define with_suhosin_patch 1 %define pkg_name php5 %define with_libedit 1 %define with_spell 1 @@ -21,7 +23,7 @@ %else BuildRequires: krb5-devel %endif -BuildRequires: apache2-devel curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel sqlite-devel sqlite2-devel tcpd-devel unixODBC-devel update-alternatives update-desktop-files zip +BuildRequires: apache2-devel curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel tcpd-devel unixODBC-devel update-alternatives update-desktop-files zip %if %{with_spell} BuildRequires: aspell-devel %endif @@ -41,9 +43,9 @@ %if %{with_libedit} BuildRequires: libedit-devel %endif -# use system PCRE on 10.2 an up only, previous versions will not work. +# use system PCRE and sqlite on 10.2 an up only, previous versions will not work. %if 0%{?suse_version} > 1010 -BuildRequires: pcre-devel +BuildRequires: pcre-devel sqlite-devel sqlite2-devel %endif %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR @@ -63,7 +65,7 @@ ### ### Version: 5.2.0 -Release: 4 +Release: 10 License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter @@ -77,6 +79,7 @@ Source1: php-suse-addons.tar.bz2 Source2: suhosin-%{suhosin_version}.tar.bz2 Source3: suhosin.ini +Source4: README.SUSE-pear #SUSE specific stuff Patch1: php5-config.patch Patch2: php5-phpize.patch @@ -85,8 +88,10 @@ #home made hack to really build against libedit Patch5: php5-really-with-libedit.patch Patch6: php5-gcc.patch -Patch7: suhosin-patch-5.2.0-0.9.6.1.patch.gz +%if %{with_suhosin_patch} +Patch7: suhosin-patch-5.2.0-%{suhosin_patch_version}.patch.gz Patch8: suhosin-patch-fixes.patch +%endif URL: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Icon: php5.xpm @@ -108,6 +113,7 @@ See http://www.php.net/credits.php for more details %package devel +Provides: php-devel pecl Summary: Include files of PHP5 Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -162,7 +168,7 @@ that, have a look at the example archive sites and some of the other resources available in the links section. -Please refer to /usr/share/doc/packages/php4/README.SuSE for +Please refer to /usr/share/doc/packages/php5/README.SUSE for information on how to load the module into the Apache webserver. @@ -1037,14 +1043,17 @@ %setup -q -n php-%{version} -a 1 tar xf %{S:2} -C ext mv ext/suhosin-%{suhosin_version} ext/suhosin +cp %{S:4} pear/README.SUSE %patch1 %patch2 %patch3 -p1 %patch4 %patch5 %patch6 +%if %{with_suhosin_patch} %patch7 -p1 %patch8 +%endif # we build three SAPI mkdir -p build-apache2 mkdir -p build-fastcgi/sapi/cgi/libfcgi @@ -1110,7 +1119,6 @@ --disable-debug \ --enable-memory-limit \ --enable-inline-optimization \ - --enable-zend-multibyte \ --disable-rpath \ "$@" # Some modules are builtin, reasons: @@ -1209,11 +1217,19 @@ --with-inifile \ --with-flatfile \ --enable-pdo=shared \ +%if 0%{?suse_version} > 1010 --with-pdo_sqlite=shared,%{_usr} \ +%else + --with-pdo_sqlite=shared \ +%endif --with-pdo-mysql=shared,%{_usr} \ --with-pdo-pgsql=shared,%{_usr} \ --with-pdo-odbc=shared,unixODBC,%{_usr} \ +%if 0%{?suse_version} > 1010 --with-sqlite=shared,%{_usr} \ +%else + --with-sqlite=shared \ +%endif --enable-sqlite-utf8 \ --enable-zip=shared \ --enable-suhosin=shared \ @@ -1223,7 +1239,6 @@ # --with-t1lib=%{_usr} \ (note: requires t1lib version 5 ) # extensions: # --with-recode=shared \ error: recode extension can not be configured together with: imap mysql yaz - #disabled extensions # --enable-embedded-mysqli \ @@ -1296,7 +1311,7 @@ # documentation mv sapi/cli/README README.CLI mv sapi/cgi/README.FastCGI README.FastCGI -rm -rf $RPM_BUILD_ROOT/{.channels,.depdb*,.filemap,.lock,usr/bin/{peardev,pecl}} +rm -rf $RPM_BUILD_ROOT/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} install -d -m 0755 $RPM_BUILD_ROOT/%{peardir}/test %post @@ -1349,10 +1364,12 @@ %{_includedir}/%{pkg_name} %{_bindir}/phpize %{_bindir}/php-config +%{_bindir}/pecl %{_datadir}/%{pkg_name}/build %files pear %defattr(-, root, root) +%doc pear/README.SUSE %{_bindir}/pear5 %config(noreplace) %{php_sysconf}/cli/pear.conf %{peardir} @@ -1623,6 +1640,24 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog -n php5 +* Wed Dec 06 2006 - anosek(a)suse.cz +- synced with BuildService + * updated Suhosin patch to 0.9.6.2 + * updated Suhosin extension to 0.9.16 + * fixed php5-devel should provide PECL tool [#204006] + * use bundled sqlite in suse versions =< 10.1 + (pdo_sqlite stopped working properly with older sqlite3 libs) + * do not use zend-multibyte anymore, please refer + to phpbug #36711 and associated links, no applications uses + this feature in the real world since it is disabled + in all other distributions/OS.seems to cause more problems + than solutions. + * change php.ini, back to short_open_tag =off (the default) + the package that depended on this setting no longer does. + Also explicitely set the upload_tmp_dir in php.ini to deal + with open_basedir recent changes (please refer + to phpbug #39123) for the details. + * suhosin.ini uses just the default recommended settings * Wed Nov 08 2006 - anosek(a)suse.cz - created symlinks /usr/bin/php and /usr/bin/pear [#216166] * Tue Nov 07 2006 - mmarek(a)suse.cz ++++++ php5-config.patch ++++++ --- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:44.000000000 +0100 +++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:44.000000000 +0100 @@ -1,20 +1,11 @@ Index: php.ini-recommended =================================================================== RCS file: /repository/php-src/php.ini-recommended,v -retrieving revision 1.179.2.11.2.8 -diff -u -r1.179.2.11.2.8 php.ini-recommended ---- php.ini-recommended 9 Sep 2006 21:56:58 -0000 1.179.2.11.2.8 -+++ php.ini-recommended 18 Sep 2006 22:41:08 -0000 -@@ -126,7 +126,7 @@ - ; servers which are not under your control, because short tags may not - ; be supported on the target server. For portable, redistributable code, - ; be sure not to use short tags. --short_open_tag = Off -+short_open_tag = On - - ; Allow ASP-style <% %> tags. - asp_tags = Off -@@ -388,7 +388,7 @@ +retrieving revision 1.179.2.11.2.12 +diff -u -r1.179.2.11.2.12 php.ini-recommended +--- php.ini-recommended 14 Oct 2006 15:06:11 -0000 1.179.2.11.2.12 ++++ php.ini-recommended 8 Nov 2006 04:34:06 -0000 +@@ -390,7 +390,7 @@ ; Disable the inclusion of HTML tags in error messages. ; Note: Never use this feature for production boxes. @@ -23,7 +14,7 @@ ; If html_errors is set On PHP produces clickable error messages that direct ; to a page describing the error or function causing the error in detail. -@@ -498,10 +498,7 @@ +@@ -500,10 +500,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -35,7 +26,13 @@ ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -@@ -520,7 +517,7 @@ +@@ -517,12 +514,12 @@ + user_dir = + + ; Directory in which the loadable extensions (modules) reside. +-extension_dir = "./" ++extension_dir = @extdir@ + ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically ; disabled on them. @@ -44,7 +41,16 @@ ; cgi.force_redirect is necessary to provide security running PHP as a CGI under ; most web servers. Left undefined, PHP turns this on by default. You can -@@ -579,6 +576,7 @@ +@@ -567,7 +564,7 @@ + + ; Temporary directory for HTTP uploaded files (will use system default if not + ; specified). +-;upload_tmp_dir = ++upload_tmp_dir = "/tmp" + + ; Maximum allowed size for uploaded files. + upload_max_filesize = 2M +@@ -581,6 +578,7 @@ allow_url_fopen = On ; Whether to allow include/require to open URLs (like http:// or ftp://) as files. @@ -52,7 +58,7 @@ allow_url_include = Off ; Define the anonymous ftp password (your email address) -@@ -597,70 +595,6 @@ +@@ -599,70 +597,6 @@ ; fgets() and file() will work regardless of the source of the file. ; auto_detect_line_endings = Off @@ -123,7 +129,7 @@ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -676,13 +610,6 @@ +@@ -704,13 +638,6 @@ define_syslog_variables = Off [mail function] @@ -137,7 +143,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -700,7 +627,7 @@ +@@ -728,7 +655,7 @@ ;odbc.default_pw = Not yet implemented ; Allow or prevent persistent links. @@ -146,7 +152,7 @@ ; Check that a connection is still valid before reuse. odbc.check_persistent = On -@@ -722,7 +649,7 @@ +@@ -750,7 +677,7 @@ [MySQL] ; Allow or prevent persistent links. @@ -155,7 +161,7 @@ ; Maximum number of persistent links. -1 means no limit. mysql.max_persistent = -1 -@@ -791,19 +718,9 @@ +@@ -819,19 +746,9 @@ ; Allow or prevent reconnect mysqli.reconnect = Off @@ -176,7 +182,7 @@ ; Detect broken persistent links always with pg_pconnect(). ; Auto reset feature requires a little overheads. -@@ -823,46 +740,6 @@ +@@ -851,46 +768,6 @@ ; Unless pgsql.ignore_notice=0, module cannot log notice message. pgsql.log_notice = 0 @@ -223,7 +229,7 @@ [bcmath] ; Number of decimal digits for all bcmath functions. -@@ -871,42 +748,6 @@ +@@ -899,42 +776,6 @@ [browscap] ;browscap = extra/browscap.ini @@ -266,7 +272,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -945,7 +786,7 @@ +@@ -975,7 +816,7 @@ ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. @@ -275,7 +281,7 @@ ; Name of the session (used as cookie name). session.name = PHPSESSID -@@ -963,7 +804,7 @@ +@@ -993,7 +834,7 @@ session.cookie_domain = ; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. @@ -284,7 +290,7 @@ ; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php -@@ -1034,7 +875,7 @@ +@@ -1064,7 +905,7 @@ ; Select a hash function ; 0: MD5 (128 bits) ; 1: SHA-1 (160 bits) @@ -293,7 +299,7 @@ ; Define how many bits are stored in each character when converting ; the binary hash data to something readable. -@@ -1051,57 +892,6 @@ +@@ -1081,57 +922,6 @@ ; Note that all valid entries require a "=", even if no value follows. url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" ++++++ php5-php-config.patch ++++++ --- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:44.000000000 +0100 +++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:44.000000000 +0100 @@ -1,16 +1,5 @@ Index: scripts/php-config.in ================================================================================ ---- php.ini-recommended -+++ php.ini-recommended -@@ -514,7 +514,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "./" -+extension_dir = @extdir@ - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically --- scripts/php-config.in +++ scripts/php-config.in @@ -4,7 +4,7 @@ ++++++ suhosin-0.9.10.tar.bz2 -> suhosin-0.9.16.tar.bz2 ++++++ ++++ 23640 lines of diff (skipped) ++++++ suhosin-patch-5.2.0-0.9.6.1.patch.gz -> suhosin-patch-5.2.0-0.9.6.2.patch.gz ++++++ Binary files php5/suhosin-patch-5.2.0-0.9.6.1.patch.gz and /mounts/work_src_done/STABLE/php5/suhosin-patch-5.2.0-0.9.6.2.patch.gz differ ++++++ suhosin.ini ++++++ --- php5/suhosin.ini 2006-10-10 09:59:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/suhosin.ini 2006-12-06 16:54:53.000000000 +0100 @@ -1,5 +1,4 @@ extension = suhosin.so - ;suhosin.log.syslog = ;suhosin.log.syslog.facility = ;suhosin.log.syslog.priority = @@ -24,9 +23,10 @@ ;suhosin.sql.bailout_on_error = 0 ;suhosin.multiheader = 0 ;suhosin.simulation = 0 +;suhosin.protectkey = 1 ;suhosin.coredump = 0 ;suhosin.apc_bug_workaround = 0 -suhosin.mail.protect = 1 +;suhosin.mail.protect = 0 ;suhosin.memory_limit = 0 ;suhosin.request.max_vars = 200 ;suhosin.request.max_varname_length = 64 @@ -69,9 +69,13 @@ ;suhosin.session.cryptua = 1 ;suhosin.session.cryptdocroot = 1 ;suhosin.session.cryptraddr = 0 +;suhosin.session.checkraddr = 0 ;suhosin.session.max_id_length = 128 -;suhosin.cookie.encrypt = 1 +;suhosin.cookie.encrypt = 0 ;suhosin.cookie.cryptkey = ;suhosin.cookie.cryptua = 1 ;suhosin.cookie.cryptdocroot = 1 ;suhosin.cookie.cryptraddr = 0 +;suhosin.cookie.checkraddr = 0 +;suhosin.cookie.cryptlist = +;suhosin.cookie.plainlist = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0