July 2010 - openSUSE Commits - openSUSE Mailing Lists

commit gpg2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package gpg2 for openSUSE:Factory checked in at Fri Jul 30 14:51:29 CEST 2010. -------- --- gpg2/gpg2.changes 2010-07-19 23:58:23.000000000 +0200 +++ gpg2/gpg2.changes 2010-07-28 11:41:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 28 09:39:00 UTC 2010 - puzel(a)novell.com + +- gnupg-CVE-2010-2547.patch (bnc#625947) +- renumber patches + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnupg-CVE-2010-2547.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpg2.spec ++++++ --- /var/tmp/diff_new_pack.oJUUtb/_old 2010-07-30 14:39:05.000000000 +0200 +++ /var/tmp/diff_new_pack.oJUUtb/_new 2010-07-30 14:39:05.000000000 +0200 @@ -20,7 +20,7 @@ Name: gpg2 Version: 2.0.16 -Release: 1 +Release: 2 BuildRequires: expect BuildRequires: fdupes BuildRequires: libgpg-error-devel >= 1.7 @@ -52,12 +52,13 @@ Obsoletes: gpg < 1.4.9 Summary: GnuPG 2 Source: gnupg-%{version}.tar.bz2 -Patch5: gnupg-2.0.10-tmpdir.diff -Patch7: gnupg-2.0.4-install_tools.diff -Patch10: gnupg-2.0.9-RSA_ES.patch -Patch11: gnupg-2.0.9-langinfo.patch -Patch12: gnupg-files-are-digests.patch -Patch14: gnupg-dont-fail-with-seahorse-agent.patch +Patch1: gnupg-2.0.10-tmpdir.diff +Patch2: gnupg-2.0.4-install_tools.diff +Patch3: gnupg-2.0.9-RSA_ES.patch +Patch4: gnupg-2.0.9-langinfo.patch +Patch5: gnupg-files-are-digests.patch +Patch6: gnupg-dont-fail-with-seahorse-agent.patch +Patch7: gnupg-CVE-2010-2547.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,12 +68,13 @@ %lang_package %prep %setup -q -n gnupg-%version +%patch1 -p1 +%patch2 +%patch3 -p1 +%patch4 %patch5 -p1 -%patch7 -%patch10 -p1 -%patch11 -%patch12 -p1 -%patch14 -p1 +%patch6 -p1 +%patch7 -p1 %build # Required for patch7: ++++++ gnupg-CVE-2010-2547.patch ++++++ Index: gnupg-2.0.16/kbx/keybox-blob.c =================================================================== --- gnupg-2.0.16.orig/kbx/keybox-blob.c 2009-09-21 18:53:44.000000000 +0200 +++ gnupg-2.0.16/kbx/keybox-blob.c 2010-07-28 11:28:50.000000000 +0200 @@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_ rc = gpg_error_from_syserror (); goto leave; } + names = tmp; } names[blob->nuids++] = p; if (!i && (p=x509_email_kludge (p))) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Jul 30 14:38:56 CEST 2010. -------- --- sysconfig/sysconfig.changes 2010-07-12 13:23:42.000000000 +0200 +++ sysconfig/sysconfig.changes 2010-07-20 13:09:26.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 20 10:58:55 UTC 2010 - mt(a)suse.de + +- version 0.74.0 +- Changed ifup-wireless to use wext wpa driver for the rt2870sta, + ipw2200 and ipw2100 wlan adapter driver (bnc#623676,bnc#623340). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 0001-ifup-dhcp-fix-for-check-whether-ipv6-is-enabled.patch sysconfig-0.73.7.tar.bz2 New: ---- sysconfig-0.74.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.yP4J5g/_old 2010-07-30 14:37:33.000000000 +0200 +++ /var/tmp/diff_new_pack.yP4J5g/_new 2010-07-30 14:37:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.73.7) +# spec file for package sysconfig (Version 0.74.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,10 @@ Name: sysconfig -Version: 0.73.7 -Release: 2 +Version: 0.74.0 +Release: 1 Summary: The system configuration scheme +Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ AutoReqProv: on @@ -29,7 +30,6 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch1: 0001-ifup-dhcp-fix-for-check-whether-ipv6-is-enabled.patch %description This package provides the SuSE system configuration scheme and @@ -49,7 +49,6 @@ %prep %setup -n sysconfig-%{version} -%patch1 -p1 %build autoreconf --force --install ++++++ sysconfig-0.73.7.tar.bz2 -> sysconfig-0.74.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/ChangeLog new/sysconfig-0.74.0/ChangeLog --- old/sysconfig-0.73.7/ChangeLog 2010-06-08 11:12:01.000000000 +0200 +++ new/sysconfig-0.74.0/ChangeLog 2010-07-20 13:04:22.000000000 +0200 @@ -1,4 +1,72 @@ -commit 20f33774c4cd95b4a0ee1c58c1f305d676d5a88e (HEAD, master) +commit ffab7a9eed2e7d837a234e1aa2949d2e7f69427e (HEAD, master) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Jul 20 13:02:34 2010 +0200 + + sysconfig.changes: updated changes, version 0.74.0 + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit dc80839ae09c02c4db899e62bc7e044cfc6ec0aa (origin/master) +Author: Vladimir Botka <vbotka(a)suse.de> +Date: Tue Jul 20 11:52:22 2010 +0200 + + ifup-wireless: iwl2000 series wlan adapters need wext + + Changed to map ipw2200 and ipw2100 wlan adapters to 'wext' + wpa driver (bnc#623340). + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + Signed-off-by: Vladimir Botka <vbotka(a)suse.de> + +commit eb203464d306d05029fc923f91a67e4f8043c39a +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Jul 20 11:35:16 2010 +0200 + + ifup-wireless: map rt2870sta to the wext wpa driver + + Changed to map rt2870sta hardware driver to 'wext' wpa driver (bnc#623676). + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit 204bedeb58e095ab47d7e95baa6a4b18c34a1120 (export/master) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Jul 20 11:25:55 2010 +0200 + + version: increased to 0.74.0 in master branch + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit c456970c03a537eaa7cb0f2b101c76a99184ca8e +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Mon Jul 12 13:19:38 2010 +0200 + + sysconfig.changes: updated (ifup-dhcp ipv6 check) + + Added ifup-dhcp ipv6 check fix changes entry (bnc#616765). + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit a83f8cb7cbca6ca67cbba174eb22a2e51972ec16 +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Mon Jul 12 13:16:06 2010 +0200 + + ifup-dhcp: fix for check whether ipv6 is enabled + + Fixed check whether ipv6 is enabled or not in /sbin/ifup-dhcp to + avoid dhcpv6 client start in case the interface is configured to + start both, dhcpv4 and dhcpv6 clients (bnc#616765). + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit 340a3ba778647a0e5e2534e04bbba55fe60d4f2d +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Jun 8 11:43:08 2010 +0200 + + Added http://gitorious.org/opensuse/sysconfig as Url in spec file + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit 20f33774c4cd95b4a0ee1c58c1f305d676d5a88e (tag: version-0.73.7, opensuse-11.3) Author: Marius Tomaschewski <mt(a)suse.de> Date: Tue Jun 8 11:10:51 2010 +0200 @@ -6,7 +74,7 @@ Signed-off-by: Marius Tomaschewski <mt(a)suse.de> -commit 58424cd3e83ab9ef612d2d94813abdae5c2e2890 (upstream/master) +commit 58424cd3e83ab9ef612d2d94813abdae5c2e2890 Author: Marius Tomaschewski <mt(a)suse.de> Date: Wed Jun 2 17:09:57 2010 +0200 @@ -33,7 +101,7 @@ Signed-off-by: Marius Tomaschewski <mt(a)suse.de> -commit b2a7a545a2db211a58dd383354f7e495f21b6c3b (mm) +commit b2a7a545a2db211a58dd383354f7e495f21b6c3b Author: Marius Tomaschewski <mt(a)suse.de> Date: Wed Jun 2 15:13:07 2010 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/VERSION new/sysconfig-0.74.0/VERSION --- old/sysconfig-0.73.7/VERSION 2010-06-08 11:02:38.000000000 +0200 +++ new/sysconfig-0.74.0/VERSION 2010-07-20 11:25:33.000000000 +0200 @@ -1 +1 @@ -0.73.7 +0.74.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/configure new/sysconfig-0.74.0/configure --- old/sysconfig-0.73.7/configure 2010-06-08 11:11:42.000000000 +0200 +++ new/sysconfig-0.74.0/configure 2010-07-20 13:03:39.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for sysconfig 0.73.7. +# Generated by GNU Autoconf 2.63 for sysconfig 0.74.0. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -746,8 +746,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.73.7' -PACKAGE_STRING='sysconfig 0.73.7' +PACKAGE_VERSION='0.74.0' +PACKAGE_STRING='sysconfig 0.74.0' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -1479,7 +1479,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.73.7 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.74.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1549,7 +1549,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.73.7:";; + short | recursive ) echo "Configuration of sysconfig 0.74.0:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.73.7 +sysconfig configure 0.74.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1663,7 +1663,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.73.7, which was +It was created by sysconfig $as_me 0.74.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2383,7 +2383,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.73.7' + VERSION='0.74.0' cat >>confdefs.h <<_ACEOF @@ -12360,7 +12360,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.73.7, which was +This file was extended by sysconfig $as_me 0.74.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12414,7 +12414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -sysconfig config.status 0.73.7 +sysconfig config.status 0.74.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/scripts/ifup-dhcp new/sysconfig-0.74.0/scripts/ifup-dhcp --- old/sysconfig-0.73.7/scripts/ifup-dhcp 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.0/scripts/ifup-dhcp 2010-07-20 11:21:31.000000000 +0200 @@ -199,7 +199,11 @@ ;; *) HAVE_IPv6=yes - test -d /proc/sys/net/ipv6 || HAVE_IPv6=no + test -d /proc/sys/net/ipv6 && { + val1=`cat "/proc/sys/net/ipv6/conf/$INTERFACE/disable_ipv6" 2>/dev/null` + val2=`cat "/proc/sys/net/ipv6/conf/all/disable_ipv6" 2>/dev/null` + test "x$val1" = x1 -o "x$val2" = x1 && HAVE_IPv6=no + } || HAVE_IPv6=no clients=0 bootprotos=(${BOOTPROTOS[@]}) @@ -256,7 +260,7 @@ if [ "x$explicit_dhcp6" = "xyes" ] ; then if [ "x$HAVE_IPv6" = xyes ] ; then print_mesg err_mesg "DHCP6 client is not available." - print_mesg err_mesg " Please install 'dhcpv6' package'" + print_mesg err_mesg " Please install 'dhcpv6' or 'dhcp-client' package'" else print_mesg err_mesg "DHCP6 disabled - no IPv6 support" fi @@ -265,7 +269,7 @@ *) DHCLIENT6="" print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN" - print_mesg err_mesg " Please install the 'dhcpv6' package" + print_mesg err_mesg " Please install the 'dhcpv6' or 'dhcp-client' package" ;; esac ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/scripts/ifup-wireless new/sysconfig-0.74.0/scripts/ifup-wireless --- old/sysconfig-0.73.7/scripts/ifup-wireless 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.0/scripts/ifup-wireless 2010-07-20 12:43:28.000000000 +0200 @@ -714,7 +714,13 @@ rt61|rt73) WPA_DRIVER=ralink ;; - ipw2200|ipw2100|ipw3945|hostap_*) + rt2870sta) + WPA_DRIVER=wext + ;; + ipw2200|ipw2100) + WPA_DRIVER=wext + ;; + ipw3945|hostap_*) WPA_DRIVER=nl80211 ;; ndiswrapper|*.sys) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/sysconfig.spec new/sysconfig-0.74.0/sysconfig.spec --- old/sysconfig-0.73.7/sysconfig.spec 2010-06-08 11:11:46.000000000 +0200 +++ new/sysconfig-0.74.0/sysconfig.spec 2010-07-20 13:03:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.73.7) +# spec file for package sysconfig (Version 0.74.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,10 @@ Name: sysconfig -Version: 0.73.7 +Version: 0.74.0 Release: 0 Summary: The system configuration scheme +Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ AutoReqProv: on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.7/sysconfig.spec.in new/sysconfig-0.74.0/sysconfig.spec.in --- old/sysconfig-0.73.7/sysconfig.spec.in 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.0/sysconfig.spec.in 2010-07-20 11:22:42.000000000 +0200 @@ -22,6 +22,7 @@ Version: @VERSION@ Release: 0 Summary: The system configuration scheme +Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ AutoReqProv: on ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 java-1_6_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Fri Jul 30 14:37:18 CEST 2010. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-05-27 10:03:20.000000000 +0200 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-07-29 10:15:35.000000000 +0200 @@ -1,0 +2,81 @@ +Wed Jul 28 12:08:30 UTC 2010 - mvyskocil(a)suse.cz + +- update to icedtea6-1.8.1 (bnc#623905) +- update to openjdk-6-b18 +- Latest security updates and hardening patches: + * (CVE-2010-0837): JAR "unpack200" must verify input parameters (6902299) + * (CVE-2010-0845): No ClassCastException for HashAttributeSet constructors if run with -Xcomp (6894807) + * (CVE-2010-0838): CMM readMabCurveData Buffer Overflow Vulnerability (6899653) + * (CVE-2010-0082): Loader-constraint table allows arrays instead of only the base-classes (6626217) + * (CVE-2010-0095): Subclasses of InetAddress may incorrectly interpret network addresses (6893954) + * (CVE-2010-0085): File TOCTOU deserialization vulnerability (6736390) + * (CVE-2010-0091): Unsigned applet can retrieve the dragged information before drop action occurs (6887703) + * (CVE-2010-0088): Inflater/Deflater clone issues (6745393) + * (CVE-2010-0084): Policy/PolicyFile leak dynamic ProtectionDomains. (6633872) + * (CVE-2010-0092): AtomicReferenceArray causes SIGSEGV -> SEGV_MAPERR error (6888149) + * (CVE-2010-0094): Deserialization of RMIConnectionImpl objects should enforce stricter checks (6893947) + * (CVE-2010-0093): System.arraycopy unable to reference elements beyond Integer.MAX_VALUE bytes (6892265) + * (CVE-2010-0840): Applet Trusted Methods Chaining Privilege Escalation Vulnerability (6904691) + * (CVE-2010-0848): AWT Library Invalid Index Vulnerability (6914823) + * (CVE-2010-0847): ImagingLib arbitrary code execution vulnerability (6914866) + * (CVE-2009-3555): TLS: MITM attacks via session renegotiation +- IcedTeaNPPlugin. + * RH524387: javax.net.ssl.SSLKeyException: RSA premaster secret error + * Set context classloader for all threads in an applet's threadgroup + * PR436: Close all applet threads on exit + * PR480: NPPlugin with NoScript extension. + * PR488: Question mark changing into underscore in URL. + * RH592553: Fix bug causing 100% CPU usage. + * Don't generate a random pointer from a pthread_t in the debug output. + * Add ForbiddenTargetException for legacy support. + * Use variadic macro for plugin debug message printing. + * Don't link the plugin with libxul libraries. + * Fix race conditions in plugin initialization code that were causing hangs. + * RH506730: BankID (Norwegian common online banking authentication system) applet fails to load. + * Fix policy evaluation to match the proprietary JDK. + * PR491: pass java_{code,codebase,archive} parameters to Java. + * Adds javawebstart.version property and give user permission to read that property. + * Old plugin removed; NPPlugin is now the default and is controlled by + --enable/disable-plugin. As with the old plugin, it produces a + IcedTeaPlugin.so library rather than IcedTeaNPPlugin.so. + * Dependence on the binary plugs mechanism removed. The plugin and NetX + code is now imported into the JDK build in the same manner as langtools, + CORBA, JAXP and JAXWS. + * Fix for plugin buffer overflow: https://bugzilla.mozilla.org/show_bug.cgi?id=555342 +- NetX: + * Fix security flaw in NetX that allows arbitrary unsigned apps to set + any java property. + * Fix a flaw that allows unsigned code to access any file on the + machine (accessible to the user) and write to it. + * Make path sanitization consistent; use a blacklisting approach. + * Make the SingleInstanceServer thread a daemon thread. + * Handle JNLP files which use native libraries but do not indicate it + * Allow JNLP classloaders to share native libraries + * Added encoding support +- bug fixes + * Nimbus Look 'n' Feel backported from OpenJDK7. + * JAXP and JAXWS now external dependencies rather than being in-tree. + * 6639665: ThreadGroup finalizer allows creation of false root ThreadGroups + * 6898622: ObjectIdentifer.equals is not capable of detecting incorrectly encoded CommonName OIDs + * 6910590: Application can modify command array in ProcessBuilder + * 6909597: JPEGImageReader stepX Integer Overflow Vulnerability + * 6932480: Crash in CompilerThread/Parser. Unloaded array klass? + * 6678385: Fixes jvm crashes when window is resized. + * Produces the "expected" behavior for full screen applications, when + running the Metacity window manager. + * Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code + * Zero/Shark + * Shark is now able to build itself. + * For ARM, add Thumb2 JIT. + * Fixed Shark sharkCompiler mattr memory corruption bug when using llvm 2.7. + * others + http://blogs.sun.com/darcy/resource/OpenJDK_6/openjdk6-b18-changes-summary.… + * Eliminate spurious exception throwing when using PulseAudio + * PR shark/483: Fix miscompilation of sun.misc.Unsafe::getByte. + * PR PR icedtea/324, icedtea/481: Fix Shark VM crash. + * Fix Zero build on Hitachi SH. + * PR476: Enable building SystemTap support on GCC 4.5. +- disabled systemtap support on openSUSE 11.2, as it requires more recent version +- require xulrunner191 on 11.1 too + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.7.3.tar.bz2 netbeans-profiler-visualvm_release65_mod.tar.bz2 openjdk-6-src-b17-14_oct_2009-fedora.tar.bz2 visualvm-111-src.tar.bz2 New: ---- icedtea6-1.8.1.tar.bz2 java-1.6.0-openjdk-visualvm-update.patch jdk6-jaf-2009_10_27.zip jdk6-jaxp-2009_10_13.zip jdk6-jaxws-2009_10_27.zip netbeans-profiler-visualvm_release68_1.tar.gz openjdk-6-src-b18-16_feb_2010-fedora.tar.bz2 visualvm_122-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:04.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b17) +# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b18) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,26 +16,51 @@ # +# Turn on/off some features depending on openSUSE version +%define with_systemtap 0 + +%ifarch %{jit_arches} +%if 0%{?suse_version} >= 1130 +%define with_systemtap 1 +%endif +%endif + %define gcjbootstrap 0 + +# If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.7.3 + +%define icedteaver 1.8.1 %define icedteasnapshot %{nil} -%define openjdkver b17 -%define openjdkdate 14_oct_2009 +%define openjdkver b18 +%define openjdkdate 16_feb_2010 + +%define jaxpdate 2009_10_13 +%define jafdate 2009_10_27 +%define jaxwsdate 2009_10_27 + %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ + %define accessmajorver 1.23 %define accessminorver 0 %define accessver %{accessmajorver}.%{accessminorver} %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ -%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/ -%define netbeansurl http://icedtea.classpath.org/visualvm/ -%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ -%define hotspotsnapshot %{nil} + +%define jaxpurl https://jaxp.dev.java.net/files/documents/913/147491/ +%define jafurl http://kenai.com/projects/jdk6-drops/downloads/download/ +%define jaxwsurl http://kenai.com/projects/jdk6-drops/downloads/download/ + +%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/146746/ +%define netbeansurl https://visualvm.dev.java.net/files/documents/7163/150173/ + %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ %define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.bz2 + %define mauvedate 2008-10-22 + %define multilib_arches ppc64 sparc64 x86_64 + %define jit_arches %{ix86} x86_64 %ifarch %{ix86} %define archbuild i586 @@ -54,6 +79,7 @@ %ifnarch %{jit_arches} %define runtests 0 %endif + %define buildoutputdir openjdk/build/linux-%{archbuild} # Convert an absolute path to a relative path. Each symbolic link is # specified relative to the directory in which it is installed so that @@ -70,7 +96,7 @@ %endif # Standard JPackage naming and versioning defines. %define origin openjdk -%define priority 17104 +%define priority 17105 %define javaver 1.6.0 %define buildver 0 # Hard-code libdir on 64-bit architectures to make the 64-bit JDK @@ -93,28 +119,36 @@ # macros from Sun package to make them similar %define pluginsdir %{_libdir}/browser-plugins %define pluginpath %{_jvmdir}/%{jrelnk}/lib/%{archinstall} -%if 0%{?suse_version} >= 1120 -%define pluginname IcedTeaNPPlugin.so -%else +# From icedtea 1.8 the new plugin is on;ly one available and is named +# IcedTeaPlugin.so (again) %define pluginname IcedTeaPlugin.so -%endif # For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share %define sdkshare %{_datadir}/%{sdkname} -Name: java-1_6_0-openjdk -%define obsoletes java-1_7_0-icedtea -# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{?suse_version} <= 1100 -Obsoletes: %obsoletes +%ifarch %{jit_arches} +# Where to install systemtap tapset (links) +# We would like these to be in a package specific subdir, +# but currently systemtap doesn't support that, so we have to +# use the root tapset dir for now. To distinquish between 64 +# and 32 bit architectures we place the tapsets under the arch +# specific dir (note that systemtap will only pickup the tapset +# for the primary arch for now). Systemtap uses the machine name +# aka build_cpu as architecture specific directory name. +#%define tapsetdir /usr/share/systemtap/tapset/%{sdkdir} +%define tapsetdir %{_datadir}/systemtap/tapset/%{_build_cpu} %endif + +Name: java-1_6_0-openjdk Version: 1.6.0.0_%{openjdkver} -Release: 5 +Release: 1 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ # hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver} # tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver} +# XXX: The 1.8.1 release provided by Matthias Klose (doko at cannonical)! Thanks +# http://people.canonical.com/~doko/tmp/hidden/hdsf76dsaf/icedtea6-1.8.1.tar.… Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz @@ -126,8 +160,11 @@ Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -Source7: %{visualvmurl}/netbeans-profiler-visualvm_release65_mod.tar.bz2 -Source8: %{visualvmurl}/visualvm-111-src.tar.bz2 +Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68_1.tar.gz +Source8: %{visualvmurl}/visualvm_122-src.tar.gz +Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip +Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip +Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsdate}.zip Source1000: java-1_6_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties @@ -139,6 +176,7 @@ Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch Patch4: java-1.6.0-openjdk-accessible-toolkit.patch +Patch5: java-1.6.0-openjdk-visualvm-update.patch # SUSE patches Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch @@ -183,7 +221,6 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel -BuildRequires: openmotif-devel BuildRequires: xorg-x11 BuildRequires: xorg-x11-proto-devel BuildRequires: libjpeg-devel @@ -195,6 +232,7 @@ BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons BuildRequires: ant +BuildRequires: ant-nodeps BuildRequires: zip %if %{gcjbootstrap} BuildRequires: ecj-bootstrap java-1_5_0-gcj-compat-devel @@ -219,24 +257,20 @@ BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: mozilla-nspr-devel -%if 0%{?suse_version} == 1130 +%if 0%{?suse_version} >= 1130 BuildRequires: mozilla-xulrunner192-devel %endif -%if 0%{?suse_version} == 1120 +%if 0%{?suse_version} <= 1120 +# in case of 11.1 needs to build against openSUSE:11:Update repo BuildRequires: mozilla-xulrunner191-devel %endif -%if 0%{?suse_version} <= 1110 -BuildRequires: mozilla-xulrunner190-devel -%endif # pulse audio requirements BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: pulseaudio >= 0.9.11 -%ifarch %{jit_arches} #system tap -%if 0%{?suse_version} >= 1120 +%if %{with_systemtap} BuildRequires: systemtap-sdt-devel >= 1.0 %endif -%endif # Zero-assembler build requirement. %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -249,14 +283,13 @@ BuildRequires: perl BuildRequires: update-desktop-files %endif + # the certificates will converted in a prep to standard keystore file - cacerts # The openssl requirment seems to be necessary for build only. # FIXME: remove!! Requires: openssl BuildRequires: openssl-certs -%if 0%{?suse_version} >= 1120 -#!BuildIgnore: libopenssl0_9_8 -%endif + Requires: rhino # Require jpackage-utils for ant. Requires: jpackage-utils >= 1.7.3 @@ -276,11 +309,9 @@ %else Requires(pre): update-alternatives %endif -%ifarch %{jit_arches} -%if 0%{?suse_version} >= 1120 +%if %{with_systemtap} Recommends: systemtap >= 1.0 %endif -%endif # Standard JPackage base provides. Provides: java-1.6.0-openjdk = %{version}-%{release} Provides: jre-%{javaver}-%{origin} = %{version}-%{release} @@ -339,10 +370,6 @@ %package devel License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception -# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{?suse_version} <= 1100 -Obsoletes: %obsoletes-devel -%endif Summary: Java SDK based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} @@ -373,9 +400,6 @@ %package demo License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{?suse_version} <= 1100 -Obsoletes: %obsoletes-demo -%endif Summary: Sources for building demo applications with OpenJDK 6 Group: Development/Languages/Java Provides: java-1.6.0-openjdk-demo = %{version}-%{release} @@ -394,9 +418,6 @@ %package src License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{?suse_version} <= 1100 -Obsoletes: %obsoletes-src -%endif Summary: OpenJDK 6 Java class sources for developers Group: Development/Languages/Java Requires: %{name}-devel = %{version}-%{release} @@ -414,9 +435,6 @@ %package javadoc License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{?suse_version} <= 1100 -Obsoletes: %obsoletes-javadoc -%endif Summary: Documentation of the Java API of OpenJDK 6 Group: Development/Languages/Java Requires(pre): %{_sbindir}/update-alternatives @@ -437,9 +455,6 @@ %package plugin License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: -%if 0%{suse_version} <= 1100 -Obsoletes: %obsoletes-plugin -%endif Summary: Java web browser plugin based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} @@ -467,8 +482,11 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 5 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -b .optflags +%patch5 -b .visualvm %patch124 -p1 -b .no-return-in-non-void %patch1000 -p1 + +cp %{SOURCE6} . cp %{SOURCE7} . cp %{SOURCE8} . @@ -480,16 +498,21 @@ %{configure} \ %ifarch %{jit_arches} %if 0%{?suse_version} >= 1120 - --enable-systemtap \ --enable-nio2 \ %endif +%if %{with_systemtap} + --enable-systemtap \ +%endif --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ %endif %if 0%{?suse_version} >= 1120 --enable-pulse-java \ --enable-nss \ - --enable-npplugin \ + --enable-plugin \ %endif + --with-jaf-drop-zip=%{SOURCE9} \ + --with-jaxp-drop-zip=%{SOURCE10} \ + --with-jaxws-drop-zip=%{SOURCE11} \ --with-openjdk=%{_jvmdir}/%{sdkdir} \ --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} @@ -512,7 +535,8 @@ %ifarch ppc ppc64 patch -l -p0 -i %{PATCH110} %endif -patch -l -p0 -i %{PATCH112} +# Seems upstreamed +#patch -l -p0 -i %{PATCH112} patch -l -p1 -i %{PATCH114} patch -l -p1 -i %{PATCH117} patch -l -p1 -i %{PATCH118} @@ -526,6 +550,7 @@ make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image + # ========== a default keystore ========== # a cacerts generation if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then @@ -542,6 +567,7 @@ yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem rm ${ALIAS}.pem done + # ========== java access bridge ========== pushd java-access-bridge-%{accessver} patch -l -p1 < %{PATCH1} @@ -554,6 +580,7 @@ cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext popd + %if %{runtests} # Run jtreg test suite. { @@ -567,6 +594,7 @@ rm -f Xvfb.pid echo ====================JTREG TESTING END==================== } || : + # Run Mauve test suite. { pushd mauve-%{mauvedate} @@ -609,6 +637,16 @@ # bnc#438674 # Install a fontconfig file which don't reffer to agfa-fonts on openSUSE cp %{S:1001} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/ + +%if %{with_systemtap} + # Install systemtap support files. + cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir} + pushd $RPM_BUILD_ROOT%{tapsetdir} + RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir}) + ln -sf $RELATIVE/*.stp . + popd +%endif # Install extension symlinks. install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir} pushd $RPM_BUILD_ROOT%{jvmjardir} @@ -632,19 +670,24 @@ ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|.jar|g") done popd + # Install JCE policy symlinks. install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla + # Install versionless symlinks. pushd $RPM_BUILD_ROOT%{_jvmdir} ln -sf %{jredir} %{jrelnk} ln -sf %{sdkdir} %{sdklnk} popd + pushd $RPM_BUILD_ROOT%{_jvmjardir} ln -sf %{sdkdir} %{jrelnk} ln -sf %{sdkdir} %{sdklnk} popd + # Remove javaws man page. rm -f man/man1/javaws.1 + # Install man pages. install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 for manpage in man/man1/* @@ -658,7 +701,7 @@ # Install demos and samples. cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} # enable short-circuit - [ ! -d sample/rmi ] && mkdir sample/rmi + mkdir -p sample/rmi [ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} @@ -680,14 +723,6 @@ popd popd %endif - - %ifarch %{jit_arches} - %if 0%{?suse_version} >= 1120 - # systemtap support - install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ - install -m 0644 tapset/hotspot.stp $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ - %endif - %endif popd # Install Javadoc documentation. install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} @@ -698,6 +733,7 @@ openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png done + # Install desktop files. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -761,12 +797,15 @@ # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/ + # noarch sub packages in openSUSE >= 11.2 %if 0%{?suse_version} >= 1120 %fdupes -s $RPM_BUILD_ROOT/%{sdkshare} %endif + %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo %fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} + # bnc496378 - check the size of installed cacerts # 32 bytes means a default empty one if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/security/cacerts) == "32" ]]; then @@ -956,6 +995,9 @@ fi %post plugin +# The new icedtea plugin has been renamed back to IcedTeaPlugin.so +alternatives --remove %{javaplugin} \ + %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null || : update-alternatives \ --install %{pluginsdir}/javaplugin.so javaplugin \ %{pluginpath}/%{pluginname} %{priority} @@ -963,7 +1005,7 @@ %postun plugin if [ $1 -eq 0 ] then - update-alternatives --remove javaplugin \ +update-alternatives --remove javaplugin \ %{pluginpath}/%{pluginname} fi @@ -987,8 +1029,8 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg %if %{suse_version} >= 1120 -%{_jvmdir}/%{jredir}/lib/security/nss.cfg # links to the demo and sample dirs in noarch subpackages %{_jvmdir}/%{sdkdir}/demo %{_jvmdir}/%{sdkdir}/sample @@ -1023,10 +1065,12 @@ %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib -%ifarch %{jit_arches} -%if 0%{?suse_version} >= 1120 -%{_datadir}/systemtap -%endif +%if %{with_systemtap} +%dir %{_datadir}/systemtap/tapset +%dir %{tapsetdir} +%dir %{_jvmdir}/%{sdkdir}/tapset +%{tapsetdir}/* +%{_jvmdir}/%{sdkdir}/tapset/* %endif %{_jvmdir}/%{sdkdir}/bin/* %{_jvmdir}/%{sdkdir}/include/* ++++++ icedtea6-1.7-no-return-in-non-void.patch ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:04.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:04.000000000 +0200 @@ -1,11 +1,11 @@ -Index: icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc +Index: icedtea6-1.8.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc =================================================================== ---- icedtea6-1.7.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-01-15 21:05:54.000000000 +0100 -+++ icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-03-04 09:38:42.077510759 +0100 -@@ -729,6 +729,7 @@ +--- icedtea6-1.8.1.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc ++++ icedtea6-1.8.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc +@@ -788,6 +788,7 @@ queue_processor(void* data) } - PLUGIN_DEBUG_0ARG("Queue processing stopped.\n"); + PLUGIN_DEBUG("Queue processing stopped.\n"); + return NULL; } ++++++ icedtea6-1.7.3.tar.bz2 -> icedtea6-1.8.1.tar.bz2 ++++++ ++++ 111073 lines of diff (skipped) ++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200 @@ -1,5 +1,5 @@ ---- openjdk/jdk/src/share/lib/security/java.security.prev 2009-09-09 10:50:09.813179147 +0100 -+++ openjdk/jdk/src/share/lib/security/java.security 2009-09-09 10:50:55.458176705 +0100 +--- jsorig 2008-12-05 11:43:39.000000000 -0500 ++++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500 @@ -127,7 +127,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has ++++++ java-1.6.0-openjdk-visualvm-update.patch ++++++ -- a/Makefile.am Thu Apr 22 11:16:37 2010 +0200 +++ Makefile.am Fri Apr 23 11:08:23 2010 +0200 @@ -10,13 +10,13 @@ CACAO_BASE_URL = http://www.complang.tuw CACAO_BASE_URL = http://www.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ -NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 -NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ -NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz +NETBEANS_PROFILER_MD5SUM = 517b66f76914970569a8add1ee96bcaf +NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/150173/ +NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68_1.tar.gz -VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe -VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/ -VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz +VISUALVM_MD5SUM = f1e2525ddcd5fdf97bcf891d715c08ff +VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/ +VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip @@ -154,10 +154,8 @@ endif if WITH_VISUALVM NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1) -NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1) else NB_PLATFORM= -NB_APISUPPORT= endif if ENABLE_PULSE_JAVA @@ -1732,16 +1730,15 @@ if WITH_VISUALVM rm nbbuild/external/binaries-list ; \ mkdir -p ./nbbuild/netbeans_visualvm/ ; \ ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_APISUPPORT)/ ./nbbuild/netbeans_visualvm/$(NB_APISUPPORT) ; \ ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ if ! (uname -a | grep x86_64) ; then \ mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ - buildscript=./buildnative-linux-15.sh ; \ + buildscript=./buildnative-linux.sh ; \ else \ mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ - buildscript=./buildnative-linux64-15.sh ; \ + buildscript=./buildnative-linux64.sh ; \ fi ; \ cd lib.profiler/native/build ; \ JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ @@ -1749,9 +1746,9 @@ if WITH_VISUALVM cd ../../.. ; \ JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ -f nbbuild/build.xml bootstrap ; \ - for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \ - -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \ + for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler profiler.oql ; do \ + JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1 \ + -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \ -f $$dir/build.xml ; \ done endif ++++++ java-1_6_0-openjdk-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200 @@ -4,6 +4,7 @@ # those patches are applied in %build phase after unpacking of openjdk # this is a false positive addFilter("patch-not-applied Patch1") +addFilter("patch-not-applied Patch2") addFilter("patch-not-applied Patch3") addFilter("patch-not-applied Patch4") addFilter("patch-not-applied Patch104") @@ -12,3 +13,6 @@ addFilter("patch-not-applied Patch107") addFilter("patch-not-applied Patch108") addFilter("patch-not-applied Patch109") + +# no need to fix this warning in demo package +addFilter("shared-lib-calls-exit .*demo") ++++++ openjdk-6-src-b17-no-multiline-comments.patch ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200 @@ -1,76 +1,3 @@ -Index: icedtea6-1.7/IcedTeaPlugin.cc -=================================================================== ---- icedtea6-1.7.orig/IcedTeaPlugin.cc -+++ icedtea6-1.7/IcedTeaPlugin.cc -@@ -594,12 +594,14 @@ char const* TYPES[10] = { "Object", - PROCESS_PENDING_EVENTS_REF (reference); \ - } \ - *result = ParseValue (type, resultC->returnValue); -+/* - // \ - // char* valueString = ValueString (type, *result); \ - // printf ("RECEIVE_VALUE: %s result: %x = %s\n", \ - // __func__, result, valueString); \ - // free (valueString); \ - // valueString = NULL; -+*/ - - #define MESSAGE_RECEIVE_SIZE(reference, result) \ - PRBool processed = PR_FALSE; \ -@@ -620,9 +622,11 @@ char const* TYPES[10] = { "Object", - *result = resultC->returnValue.ToInteger (&conversionResult); \ - PLUGIN_CHECK ("parse integer", conversionResult); \ - } -+/* - // \ - // printf ("RECEIVE_SIZE: %s result: %x = %d\n", \ - // __func__, result, *result); -+*/ - - // strdup'd string must be freed by calling function. - #define MESSAGE_RECEIVE_STRING(reference, char_type, result) \ -@@ -644,9 +648,11 @@ char const* TYPES[10] = { "Object", - *result = reinterpret_cast<char_type const*> \ - (strdup (resultC->returnValue.get ()));\ - } -+/* - // \ - // printf ("RECEIVE_STRING: %s result: %x = %s\n", \ - // __func__, result, *result); -+*/ - - // strdup'd string must be freed by calling function. - #define MESSAGE_RECEIVE_STRING_UCS(reference, result) \ -@@ -671,9 +677,11 @@ char const* TYPES[10] = { "Object", - *result = static_cast<jchar const*> (newstring); \ - } - -+/* - // \ - // printf ("RECEIVE_STRING: %s result: %x = %s\n", \ - // __func__, result, *result); -+*/ - - #define MESSAGE_RECEIVE_BOOLEAN(reference, result) \ - PRBool processed = PR_FALSE; \ -@@ -690,13 +698,17 @@ char const* TYPES[10] = { "Object", - *result = NULL; \ - else \ - *result = resultC->returnIdentifier; -+/* - // res = factory->current->ProcessNextEvent (PR_TRUE, \ - // &processed); \ - // PLUGIN_CHECK_RETURN (__func__, res); \ -+*/ - -+/* - // \ - // printf ("RECEIVE_BOOLEAN: %s result: %x = %s\n", \ - // __func__, result, *result ? "true" : "false"); -+*/ - - #include <nsISupports.h> - #include <nsIFactory.h> Index: icedtea6-1.7/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp =================================================================== --- icedtea6-1.7.orig/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp ++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++ --- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200 +++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200 @@ -1,7 +1,9 @@ unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -@@ -937,6 +937,7 @@ void BytecodeInterpreter::layout_interpr +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +@@ -935,6 +935,7 @@ void BytecodeInterpreter::layout_interpr address CppInterpreter::return_entry(TosState state, int length) { ShouldNotCallThis(); @@ -9,7 +11,7 @@ } address CppInterpreter::deopt_entry(TosState state, int length) { -@@ -957,6 +958,7 @@ bool CppInterpreter::contains(address pc +@@ -955,6 +956,7 @@ bool CppInterpreter::contains(address pc #else return false; // make frame::print_value_on work #endif // !PRODUCT @@ -17,24 +19,11 @@ } // Result handlers and convertors -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp -@@ -28,8 +28,10 @@ - - static int pd_instruction_alignment() { - ShouldNotCallThis(); -+ return 0; // make gcc happy - } - - static const char* pd_cpu_opts() { - ShouldNotCallThis(); -+ return ""; // make gcc happy - } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp -@@ -84,6 +84,7 @@ void frame::patch_pc(Thread* thread, add +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp +@@ -88,6 +88,7 @@ void frame::patch_pc(Thread* thread, add bool frame::safe_for_sender(JavaThread *thread) { ShouldNotCallThis(); @@ -42,7 +31,7 @@ } void frame::pd_gc_epilog() { -@@ -91,6 +92,7 @@ void frame::pd_gc_epilog() { +@@ -95,6 +96,7 @@ void frame::pd_gc_epilog() { bool frame::is_interpreted_frame_valid(JavaThread *thread) const { ShouldNotCallThis(); @@ -50,7 +39,7 @@ } BasicType frame::interpreter_frame_result(oop* oop_result, -@@ -155,6 +157,7 @@ int frame::frame_size() const { +@@ -159,6 +161,7 @@ int frame::frame_size() const { #else return 0; // make javaVFrame::print_value work #endif // PRODUCT @@ -58,9 +47,10 @@ } intptr_t* frame::interpreter_frame_tos_at(jint offset) const { -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp @@ -71,6 +71,7 @@ inline intptr_t* frame::sender_sp() cons inline intptr_t* frame::link() const { @@ -87,9 +77,10 @@ } inline intptr_t* frame::unextended_sp() const { -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp @@ -41,9 +41,11 @@ void InlineCacheBuffer::assemble_ic_buff address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate @@ -102,9 +93,10 @@ ShouldNotCallThis(); + return NULL; // make gcc happy } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp @@ -37,10 +37,12 @@ address InterpreterGenerator::generate_m return NULL; @@ -118,9 +110,10 @@ } int AbstractInterpreter::size_activation(methodOop method, -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp @@ -41,6 +41,7 @@ static int expr_tag_index_at(int i) { assert(TaggedStackInterpreter, "should not call this"); @@ -143,9 +136,10 @@ Unimplemented(); + return 0; // make gcc happy } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp @@ -42,15 +42,18 @@ class NativeInstruction VALUE_OBJ_CLASS_ public: bool is_jump() { @@ -271,9 +265,10 @@ ShouldNotCallThis(); + return NULL; // make gcc happy } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp @@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr const char* RegisterImpl::name() const { @@ -285,9 +280,10 @@ ShouldNotCallThis(); + return ""; // make gcc happy } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp @@ -32,6 +32,7 @@ void Relocation::pd_set_data_value(addre address Relocation::pd_call_destination(address orig_addr) { @@ -312,9 +308,10 @@ } void Relocation::pd_swap_in_breakpoint(address x, -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp @@ -69,6 +69,7 @@ nmethod *SharedRuntime::generate_native_ #else ShouldNotCallThis(); @@ -337,9 +334,10 @@ ShouldNotCallThis(); + return 0; // make gcc happy } -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp @@ -28,16 +28,20 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { @@ -361,10 +359,11 @@ ShouldNotCallThis(); + return 0; // make gcc happy } -diff -u icedtea6-1.7.3/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp icedtea6-1.7.3/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ---- icedtea6-1.7.3/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -@@ -33,6 +33,7 @@ +Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +@@ -33,6 +33,7 @@ address os::current_stack_pointer() { frame os::get_sender_for_C_frame(frame* fr) { ShouldNotCallThis(); @@ -372,7 +371,7 @@ } frame os::current_frame() { -@@ -62,6 +63,7 @@ +@@ -62,6 +63,7 @@ char* os::non_memory_address_word() { // This is the value for x86; works pretty well for PPC too. return (char *) -1; #endif // SPARC @@ -380,7 +379,7 @@ } void os::initialize_thread() { -@@ -70,16 +72,19 @@ +@@ -70,16 +72,19 @@ void os::initialize_thread() { address os::Linux::ucontext_get_pc(ucontext_t* uc) { ShouldNotCallThis(); @@ -400,7 +399,7 @@ } #ifdef HOTSPOT_ASM -@@ -234,6 +239,7 @@ +@@ -234,6 +239,7 @@ JVM_handle_linux_signal(int sig, sprintf(buf, fmt, sig); fatal(buf); @@ -408,7 +407,7 @@ } void os::Linux::init_thread_fpu_state(void) { -@@ -242,6 +248,7 @@ +@@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo int os::Linux::get_fpu_control_word() { ShouldNotCallThis(); @@ -416,7 +415,7 @@ } void os::Linux::set_fpu_control_word(int fpu) { -@@ -264,6 +271,7 @@ +@@ -264,6 +271,7 @@ bool os::is_allocatable(size_t bytes) { return addr != NULL; #endif // _LP64 @@ -424,7 +423,7 @@ } /////////////////////////////////////////////////////////////////////////////// -@@ -386,6 +394,7 @@ +@@ -386,6 +394,7 @@ void os::print_context(outputStream* st, extern "C" { int SpinPause() { @@ -432,7 +431,7 @@ } int SafeFetch32(int *adr, int errValue) { -@@ -475,6 +484,7 @@ +@@ -475,6 +484,7 @@ extern "C" { long long unsigned int oldval, long long unsigned int newval) { ShouldNotCallThis(); @@ -440,9 +439,10 @@ } }; #endif // !_LP64 -unchanged: ---- icedtea6-1.7.3.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp -+++ icedtea6-1.7.3/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +=================================================================== +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp ++++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -95,6 +95,7 @@ void* ucontext, bool isInJava) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 systemd for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at Fri Jul 30 13:59:57 CEST 2010. -------- New Changes file: --- /dev/null 2010-05-08 11:31:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/systemd/systemd.changes 2010-07-24 11:24:21.000000000 +0200 @@ -0,0 +1,225 @@ +------------------------------------------------------------------- +Sat Jul 24 11:16:52 CEST 2010 - kay.sievers(a)novell.com + +- at install, read old inittab for the defaul target/runlevel +- disable services on package uninstall + +------------------------------------------------------------------- +Sat Jul 24 09:50:05 CEST 2010 - kay.sievers(a)novell.com + +- version 4 + - merge systemd-install into systemctl + +------------------------------------------------------------------- +Fri Jul 23 10:39:19 CEST 2010 - kay.sievers(a)novell.com + +- create config files in /etc in %post +- mark files in /etc as config +- remove nodev from /dev/pts +- add selinux support + +------------------------------------------------------------------- +Thu Jul 22 10:51:16 CEST 2010 - kay.sievers(a)novell.com + +- version 4 (pre) + - require newer vala + - add [Install] section to getty.target and remote-fs.target +- re-enable post-build check + +------------------------------------------------------------------- +Wed Jul 21 08:51:22 CEST 2010 - kay.sievers(a)novell.com + +- do not add sysv services that are not enabled in /etc/rcN.d/ +- allow symlinking unit files to /dev/null +- remove only pam sessions we ourselves created +- unit files in /etc/ always take precedence, even over link targets + +------------------------------------------------------------------- +Tue Jul 20 21:20:43 CEST 2010 - kay.sievers(a)novell.com + +- fix access mode verification of FIFOs + +------------------------------------------------------------------- +Sun Jul 18 11:31:06 CEST 2010 - kay.sievers(a)novell.com + +- fix default mode of /var/run and /var/lock +- force /var/run and /var/lock to be on tmpfs + +------------------------------------------------------------------- +Wed Jul 14 17:49:57 CEST 2010 - kay.sievers(a)novell.com + +- always enable udev and dbus until we can require systemd from + packages providing systemd service files + +------------------------------------------------------------------- +Wed Jul 14 01:10:27 CEST 2010 - kay.sievers(a)novell.com + +- drop systemd-units.rpm + +------------------------------------------------------------------- +Wed Jul 14 00:07:24 CEST 2010 - kay.sievers(a)novell.com + +- version 3 + - treat non-existing cgroups like empty ones, to deal with races + - replace --running-as= by --session and --system + - always allow stopping of units that failed to load + +------------------------------------------------------------------- +Tue Jul 13 06:22:56 CEST 2010 - kay.sievers(a)novell.com + +- update + +------------------------------------------------------------------- +Mon Jul 12 18:23:41 CEST 2010 - kay.sievers(a)novell.com + +- drop libcgroup + +------------------------------------------------------------------- +Mon Jul 12 10:04:26 CEST 2010 - kay.sievers(a)novell.com + +- trim cgroups for services that are "active" but "exited" +- drop /bin/init hack and require now fixed mkinitrd + +------------------------------------------------------------------- +Sun Jul 11 23:38:45 CEST 2010 - kay.sievers(a)novell.com + +- fix reboot issue +- fix abstract namespace name handling (needs udev update) +- prefer private D-Bus socket wherever possible + +------------------------------------------------------------------- +Sun Jul 11 00:50:14 CEST 2010 - kay.sievers(a)novell.com + +- D-Bus 1.3.2 support +- use COLD_BOOT=1 on reboot to skip sysv boot.d/ handling + +------------------------------------------------------------------- +Fri Jul 9 10:05:00 CEST 2010 - kay.sievers(a)novell.com + +- fix typo in spec file + +------------------------------------------------------------------- +Fri Jul 9 09:09:33 CEST 2010 - kay.sievers(a)novell.com + +- provide /bin/init to be found by 'too simple' mkinitrd, and work + around mindless relinking of relative links in the buildsystem +- add rpmlintrc to silent warnings about intentional behavior + +------------------------------------------------------------------- +Fri Jul 9 06:18:52 CEST 2010 - kay.sievers(a)novell.com + +- version 2 + +------------------------------------------------------------------- +Thu Jul 8 23:48:09 CEST 2010 - kay.sievers(a)novell.com + +- fix 'reboot -w' to skip the actual reboot +- fix segfault in D-Bus code +- use unique instead of multiple keys in config file +- support continuation lines in config files +- support multiple commands in a single key in config files +- adapt log level of some messages + +------------------------------------------------------------------- +Wed Jul 7 06:20:00 CEST 2010 - kay.sievers(a)novell.com + +- version 1 + - default log level to INFO + - show welcome message + +------------------------------------------------------------------- +Tue Jul 6 08:55:03 CEST 2010 - kay.sievers(a)novell.com + +- add systemd-install --start option +- add more documentation + +------------------------------------------------------------------- +Mon Jul 5 16:23:28 CEST 2010 - kay.sievers(a)novell.com + +- new snapshot with extended D-Bus support + +------------------------------------------------------------------- +Sun Jul 4 21:31:49 CEST 2010 - kay.sievers(a)novell.com + +- new snapshot with default unit dependency handling + +------------------------------------------------------------------- +Sat Jul 3 16:54:19 CEST 2010 - kay.sievers(a)novell.com + +- new snapshot + +------------------------------------------------------------------- +Fri Jul 2 10:04:26 CEST 2010 - kay.sievers(a)novell.com + +- add more documentation + +------------------------------------------------------------------- +Thu Jul 1 17:40:28 CEST 2010 - kay.sievers(a)novell.com + +- new snapshot + +------------------------------------------------------------------- +Fri Jun 25 00:34:03 CEST 2010 - kay.sievers(a)novell.com + +- split off systemd-units.rpm which can be pulled-in by other + packages without further dependencies + +------------------------------------------------------------------- +Thu Jun 24 09:40:06 CEST 2010 - kay.sievers(a)novell.com + +- add more documentation + +------------------------------------------------------------------- +Tue Jun 22 22:13:02 CEST 2010 - kay.sievers(a)novell.com + +- more man pages and documentation + +------------------------------------------------------------------- +Tue Jun 22 18:14:05 CEST 2010 - kay.sievers(a)novell.com + +- conflict with upstart +- include all installed doc files + +------------------------------------------------------------------- +Tue Jun 22 09:33:44 CEST 2010 - kay.sievers(a)novell.com + +- provide pam module + +------------------------------------------------------------------- +Mon Jun 21 10:21:20 CEST 2010 - kay.sievers(a)novell.com + +- use private D-Bus connection +- properly handle replacing a running upstart + +------------------------------------------------------------------- +Fri Jun 18 09:37:46 CEST 2010 - kay.sievers(a)novell.com + +- implement wall message in halt/reboot/... ++++ 28 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/systemd/systemd.changes calling whatdependson for head-i586 New: ---- systemd-4.tar.bz2 systemd-rpmlintrc systemd.changes systemd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ # # spec file for package systemd (Version 4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 4 Release: 1 License: GPLv2+ Group: System/Base Summary: A System and Session Manager BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libudev-devel udev BuildRequires: libcap-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: dbus-1-glib-devel gtk2-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 160 Requires: dbus-1 >= 1.3.2 Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar… Source1: systemd-rpmlintrc %description Systemd is a system and session manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. %package gtk License: GPLv2+ Group: System/Base Summary: Graphical front-end for systemd Requires: %{name} = %{version}-%{release} %description gtk Graphical front-end for systemd system and session manager. %package sysvinit License: GPLv2+ Group: System/Base Summary: System V init tools Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: sysvinit Conflicts: upstart %description sysvinit Drop-in replacement of System V init tools. %prep %setup -q %build # prevent pre-generated and distributed files from re-building find . -name "*.[1-8]" -exec touch '{}' \; touch src/systemadm.c export V=1 %configure \ --with-distro=suse \ --docdir=%{_docdir}/systemd \ --with-rootdir= \ CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install %makeinstall find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' mkdir -p $RPM_BUILD_ROOT/sbin ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel rm -rf $RPM_BUILD_ROOT/etc/systemd/system/*.target.wants rm -f $RPM_BUILD_ROOT/etc/systemd/system/default.target %pre # kernel changes are pending to move this to /sys/fs/cgroup mkdir -p -m 0755 /cgroup || : %post # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ "$1" -eq 1 ]; then # Try to read default runlevel from the old inittab if it exists runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) if [ -z "$runlevel" ] ; then target="/lib/systemd/system/graphical.target" else target="/etc/systemd/system/runlevel$runlevel.target" fi /bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || : # Enable the services we install by default. /bin/systemctl enable getty@.service >/dev/null 2>&1 || : /bin/systemctl enable remote-fs.target >/dev/null 2>&1 || : /bin/systemctl enable var-run.mount >/dev/null 2>&1 || : /bin/systemctl enable var-lock.mount >/dev/null 2>&1 || : fi # Make sure we always enable these basic services, in case something went # wrong at the time these packages got installed. Usual systems can not # properly bootup without these services. /bin/systemctl enable udev.service >/dev/null 2>&1 || : /bin/systemctl enable dbus.service >/dev/null 2>&1 || : %preun if [ $1 -eq 0 ]; then /bin/systemctl disable getty@.service >/dev/null 2>&1 || : /bin/systemctl disable remote-fs.target >/dev/null 2>&1 || : /bin/systemctl disable var-run.mount >/dev/null 2>&1 || : /bin/systemctl disable var-lock.mount >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /bin/systemd /bin/systemctl /bin/systemd-notify %{_bindir}/systemd-cgls /lib/systemd/systemd-* /%{_lib}/security/pam_systemd.so %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/session %dir %{_sysconfdir}/xdg/systemd/session %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target %config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* %{_mandir}/man7/*.7* %{_mandir}/man8/*.8* %{_docdir}/systemd /lib/udev/rules.d/*.rules %dir /lib/systemd /lib/systemd/system %dir %{_sysconfdir}/systemd %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm %{_mandir}/man1/systemadm.1* %files sysvinit %defattr(-,root,root,-) /sbin/init /sbin/reboot /sbin/halt /sbin/shutdown /sbin/poweroff /sbin/telinit /sbin/runlevel %{_mandir}/man1/init.1* %{_mandir}/man8/halt.8* %{_mandir}/man8/reboot.8* %{_mandir}/man8/shutdown.8* %{_mandir}/man8/poweroff.8* %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* %changelog ++++++ systemd-rpmlintrc ++++++ addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") addFilter(".*devel-file-in-non-devel-package.*systemd.pc.*") addFilter(".*files-duplicate .*/reboot.8.*") addFilter(".*files-duplicate .*/sd_is_socket.3.*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zip for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package zip for openSUSE:Factory checked in at Fri Jul 30 13:00:49 CEST 2010. -------- --- zip/zip.changes 2010-03-06 04:07:47.000000000 +0100 +++ zip/zip.changes 2010-05-21 19:01:21.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 21 18:52:08 CEST 2010 - pth(a)suse.de + +- Update to Zip 3.0: + * large-file support (i.e., > 2GB) + * support for more than 65536 files per archive + * multi-part archive support + * bzip2 compression support + * Unicode (UTF-8) filename and (partial) comment support + * difference mode (for incremental backups) + * filesystem-synch mode + * cross-archive copy mode + * extended progress info and logging + * improved archive-fixing support + * improved streaming and piping + * improved command-line parser + * improved Unix FIFO support + * Unix 32-bit UIDs/GIDs (requires UnZip 6.0 to restore) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zip-2.3-iso8859_2.patch zip-2.3-nonexec-stack.patch zip-2.3-optflags.patch zip-2.3-tempfile.patch zip-2.32.tar.bz2 New: ---- zip-3.0-add_options_to_help.patch zip-3.0-iso8859_2.patch zip-3.0-nonexec-stack.patch zip-3.0-optflags.patch zip-3.0-tempfile.patch zip-3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zip.spec ++++++ --- /var/tmp/diff_new_pack.owRzCz/_old 2010-07-30 12:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.owRzCz/_new 2010-07-30 12:58:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zip (Version 2.32) +# spec file for package zip (Version 3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,16 +24,18 @@ Provides: crzip Obsoletes: crzip AutoReqProv: on -Version: 2.32 -Release: 78 +Version: 3.0 +Release: 1 +%define file_version 30 Summary: File compression program Url: http://www.info-zip.org/ Source: %name-%version.tar.bz2 -Patch1: zip-2.3-tempfile.patch -Patch2: zip-2.3-iso8859_2.patch -Patch3: zip-2.3-nonexec-stack.patch -Patch4: zip-2.3-optflags.patch -Patch5: zip-notimestamp.patch +Patch2: zip-3.0-iso8859_2.patch +Patch3: zip-3.0-add_options_to_help.patch +Patch4: zip-3.0-nonexec-stack.patch +Patch5: zip-3.0-optflags.patch +Patch6: zip-3.0-tempfile.patch +Patch7: zip-notimestamp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,12 +49,13 @@ Info-ZIP <zip-bugs(a)lists.wku.edu> %prep -%setup -q -%patch1 +%setup -q -n zip%{file_version} %patch2 %patch3 %patch4 %patch5 +%patch6 +%patch7 %build make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc @@ -67,11 +70,14 @@ %files %defattr(-,root,root) -%doc BUGS CHANGES INSTALL LICENSE MANUAL README TODO WHATSNEW WHERE +%doc BUGS CHANGES INSTALL LICENSE README TODO WHATSNEW WHERE %doc %{_mandir}/man1/zip.1.gz -/usr/bin/zip -/usr/bin/zipcloak -/usr/bin/zipnote -/usr/bin/zipsplit +%doc %{_mandir}/man1/zipcloak.1.gz +%doc %{_mandir}/man1/zipnote.1.gz +%doc %{_mandir}/man1/zipsplit.1.gz +%{_bindir}/zip +%{_bindir}/zipcloak +%{_bindir}/zipnote +%{_bindir}/zipsplit %changelog ++++++ zip-3.0-add_options_to_help.patch ++++++ --- zip.c +++ zip.c @@ -730,6 +730,7 @@ " -r recurse into directories (see Recursion below)", " -m after archive created, delete original files (move into archive)", " -j junk directory names (store just file names)", +" -k Attempt to convert the names and paths to conform to MSDOS", " -q quiet operation", " -v verbose operation (just \"zip -v\" shows version information)", " -c prompt for one-line comment for each entry", ++++++ zip-2.3-iso8859_2.patch -> zip-3.0-iso8859_2.patch ++++++ --- zip/zip-2.3-iso8859_2.patch 2009-11-24 18:21:16.000000000 +0100 +++ zip/zip-3.0-iso8859_2.patch 2010-05-21 19:01:19.000000000 +0200 @@ -1,12 +1,11 @@ Index: ebcdic.h =================================================================== ---- ebcdic.h.orig 2005-01-29 05:25:54.000000000 +0100 -+++ ebcdic.h 2009-11-24 18:19:52.726932000 +0100 -@@ -254,6 +254,25 @@ ZCONST uch Far iso2oem[] = { - 0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6, /* F0 - F7 */ +--- ebcdic.h.orig 2005-04-09 23:10:02.000000000 +0200 ++++ ebcdic.h 2010-05-21 18:47:36.891591234 +0200 +@@ -277,6 +277,24 @@ ZCONST uch Far iso2oem[] = { 0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98 /* F8 - FF */ }; -+ + #endif /* OEM_RUS */ +ZCONST uch Far iso2oem_2[] = { + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, @@ -28,10 +27,10 @@ #endif /* IZ_ISO2OEM_ARRAY */ #ifdef IZ_OEM2ISO_ARRAY -@@ -275,6 +294,25 @@ ZCONST uch Far oem2iso[] = { - 0xAD, 0xB1, 0x3D, 0xBE, 0xB6, 0xA7, 0xF7, 0xB8, /* F0 - F7 */ +@@ -319,6 +337,25 @@ ZCONST uch Far oem2iso[] = { 0xB0, 0xA8, 0xB7, 0xB9, 0xB3, 0xB2, 0xA6, 0xA0 /* F8 - FF */ }; + #endif /* OEM_RUS */ + +ZCONST uch Far oem2iso_2[] = { + 0xC7, 0xFC, 0xE9, 0xE2, 0xE4, 0xF9, 0xE6, 0xE7, @@ -56,9 +55,9 @@ #if defined(THEOS) || defined(THEOS_SUPPORT) Index: globals.c =================================================================== ---- globals.c.orig 2005-03-20 21:32:02.000000000 +0100 -+++ globals.c 2009-11-24 18:19:52.730930000 +0100 -@@ -30,6 +30,8 @@ int pathput = 1; /* 1=store path +--- globals.c.orig 2008-05-25 19:26:38.000000000 +0200 ++++ globals.c 2010-05-21 18:47:36.895590875 +0200 +@@ -32,6 +32,8 @@ int pathput = 1; /* 1=store path int scanimage = 1; /* 1=scan through image files */ #endif int method = BEST; /* one of BEST, DEFLATE (only), or STORE (only) */ @@ -66,54 +65,55 @@ +int iso8859_2 = 0; /* 1=ISO8859-2 will be used instead of ISO8859-1 */ int dosify = 0; /* 1=make new entries look like MSDOS */ int verbose = 0; /* 1=report oddities in zip file structure */ - int fix = 0; /* 1=fix the zip file */ + int fix = 0; /* 1=fix the zip file, 2=FF, 3=ZipNote */ Index: man/zip.1 =================================================================== ---- man/zip.1.orig 2006-06-20 04:25:00.000000000 +0200 -+++ man/zip.1 2009-11-24 18:19:52.747932000 +0100 -@@ -14,7 +14,7 @@ - zip, zipcloak, zipnote, zipsplit \- package and compress (archive) files +--- man/zip.1.orig 2008-06-17 02:39:40.000000000 +0200 ++++ man/zip.1 2010-05-21 18:47:36.895590875 +0200 +@@ -18,7 +18,7 @@ + zip \- package and compress (archive) files .SH SYNOPSIS .B zip --.RB [ \-aABcdDeEfFghjklLmoqrRSTuvVwXyz!@$ ] -+.RB [ \-aABcdDeEfFghjkKlLmoOqrRSTuvVwXyz!@$ ] - .RB [ \-b\ path ] - .RB [ \-n\ suffixes ] - .RB [ \-t\ mmddyyyy ] -@@ -543,7 +543,15 @@ Attempt to convert the names and paths t - store only the MSDOS attribute (just the user write attribute from UNIX), +-.RB [\- aABcdDeEfFghjklLmoqrRSTuvVwXyz!@$ ] ++.RB [\- aABcdDeEfFghjklLmoOqrRSTuvVwXyz!@$ ] + [\-\-longoption ...] + .RB [\- b " path]" + .RB [\- n " suffixes]" +@@ -1322,7 +1322,15 @@ Attempt to convert the names and paths t + store only the MSDOS attribute (just the user write attribute from Unix), and mark the entry as made under MSDOS (even though it was not); for compatibility with PKUNZIP under MSDOS which cannot handle certain -names such as those with two dots. +names such as those with two dots. Conversion from ISO8859-1 to -+IBM PC CP 852 is used. See also -+.B \-O ++IBM PC CP 852 is used. See also ++.B \-OO +.TP +.B \-K +Attempt to convert the names and paths to conform to MS Windows. Behaviour -+similar to ++similar to +.B \-k +but long names are used. .TP + .PD 0 .B \-l - Translate the Unix end-of-line character LF into the -@@ -706,6 +714,11 @@ will change the last modified time of - to the latest time of the entries in - .IR foo.zip . +@@ -1578,6 +1586,12 @@ with encrypted entries, \fIzipcloak\fP w + them to normal entries. .TP -+.B \-O -+File names will be converted from ISO8859-2 instead of from ISO8859-1. See + .PD 0 ++.B \-OO ++File names will be converted from ISO8859-2 instead of from ISO8859-1. See +.B \-k +for details. +.TP - \fB\-P\fP\ \fIpassword\fP - use \fIpassword\fP to encrypt zipfile entries (if any). \fBTHIS IS - INSECURE!\fP Many multi-user operating systems provide ways for any user to ++.PD 0 + .B \-p + .TP + .PD Index: unix/unix.c =================================================================== ---- unix/unix.c.orig 2006-05-30 00:35:00.000000000 +0200 -+++ unix/unix.c 2009-11-24 18:19:52.754931000 +0100 -@@ -261,9 +261,14 @@ int *pdosflag; /* output: force +--- unix/unix.c.orig 2008-06-19 06:26:18.000000000 +0200 ++++ unix/unix.c 2010-05-21 18:47:36.975590824 +0200 +@@ -267,9 +267,14 @@ int *pdosflag; /* output: force return NULL; strcpy(n, t); @@ -131,21 +131,21 @@ #endif Index: util.c =================================================================== ---- util.c.orig 2006-03-06 07:13:30.000000000 +0100 -+++ util.c 2009-11-24 18:19:52.759937000 +0100 -@@ -470,7 +470,10 @@ char *str_iso_to_oem(dst, src) +--- util.c.orig 2008-03-29 13:19:08.000000000 +0100 ++++ util.c 2010-05-21 18:47:37.287590701 +0200 +@@ -725,7 +725,10 @@ char *str_iso_to_oem(dst, src) char *dst; { char *dest_start = dst; - while (*dst++ = (char)iso2oem[(uch)(*src++)]); + if (!iso8859_2) + while (*src) { *dst++ = (*src & 0x80) ? iso2oem[*src++ & 0x7f] : *src++; } -+ else ++ else + while (*src) { *dst++ = (*src & 0x80) ? iso2oem_2[*src++ & 0x7f] : *src++; } return dest_start; } #endif -@@ -481,7 +484,10 @@ char *str_oem_to_iso(dst, src) +@@ -736,7 +739,10 @@ char *str_oem_to_iso(dst, src) char *dst; { char *dest_start = dst; @@ -159,9 +159,34 @@ #endif Index: zip.c =================================================================== ---- zip.c.orig 2006-06-19 02:16:24.000000000 +0200 -+++ zip.c 2009-11-24 18:19:52.766924000 +0100 -@@ -979,6 +979,8 @@ char **argv; /* command line +--- zip.c.orig 2008-07-05 18:34:06.000000000 +0200 ++++ zip.c 2010-05-21 18:48:04.779644629 +0200 +@@ -1942,7 +1942,7 @@ int set_filetype(out_path) + #ifdef UNICODE_TEST + #define o_sC 0x146 + #endif +- ++#define o_OO 0x147 + + /* the below is mainly from the old main command line + switch with a few changes */ +@@ -2025,6 +2025,7 @@ struct option_struct far options[] = { + #endif /* ?MACOS */ + {"J", "junk-sfx", o_NO_VALUE, o_NOT_NEGATABLE, 'J', "strip self extractor from archive"}, + {"k", "DOS-names", o_NO_VALUE, o_NOT_NEGATABLE, 'k', "force use of 8.3 DOS names"}, ++ {"K", "latin1-entries", o_NO_VALUE, o_NOT_NEGATABLE, 'K', "convert file names from CP850 to ISO8859-1"}, + {"l", "to-crlf", o_NO_VALUE, o_NOT_NEGATABLE, 'l', "convert text file line ends - LF->CRLF"}, + {"ll", "from-crlf", o_NO_VALUE, o_NOT_NEGATABLE, o_ll, "convert text file line ends - CRLF->LF"}, + {"lf", "logfile-path",o_REQUIRED_VALUE, o_NOT_NEGATABLE, o_lf, "log to log file at path (default overwrite)"}, +@@ -2043,6 +2044,7 @@ struct option_struct far options[] = { + #endif + {"o", "latest-time", o_NO_VALUE, o_NOT_NEGATABLE, 'o', "use latest entry time as archive time"}, + {"O", "output-file", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'O', "set out zipfile different than in zipfile"}, ++ {"OO", "iso8859-2", o_NO_VALUE, o_NOT_NEGATABLE, o_OO, "Use ISO8859-2 instead of ISO8859-1"}, + {"p", "paths", o_NO_VALUE, o_NOT_NEGATABLE, 'p', "store paths"}, + {"P", "password", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'P', "encrypt entries, option value is password"}, + #if defined(QDOS) || defined(QLZIP) +@@ -2289,6 +2291,8 @@ char **argv; /* command line dispose = 0; /* 1=remove files after put in zip file */ pathput = 1; /* 1=store path with name */ method = BEST; /* one of BEST, DEFLATE (only), or STORE (only) */ @@ -170,30 +195,30 @@ dosify = 0; /* 1=make new entries look like MSDOS */ verbose = 0; /* 1=report oddities in zip file structure */ fix = 0; /* 1=fix the zip file */ -@@ -1263,6 +1265,8 @@ char **argv; /* command line - junk_sfx = 1; break; - case 'k': /* Make entries using DOS names (k for Katz) */ - dosify = 1; break; -+ case 'K': /* file names will be converted from IBM PC CP 850 to ISO8859-1 */ -+ winify = dosify = 1; break; - case 'l': /* Translate end-of-line */ - translate_eol++; break; - #ifndef WINDLL -@@ -1287,6 +1291,8 @@ char **argv; /* command line - #endif - case 'o': /* Set zip file time to time of latest file in it */ - latest = 1; break; -+ case 'O': /* ISO8859-2 will be used instead of ISO8859-1 */ -+ iso8859_2 = 1; break; - case 'p': /* Store path with name */ - break; /* (do nothing as annoyance avoidance) */ - case 'P': /* password for encryption */ +@@ -2859,6 +2863,8 @@ char **argv; /* command line + junk_sfx = 1; break; + case 'k': /* Make entries using DOS names (k for Katz) */ + dosify = 1; break; ++ case 'K': /* file names will be converted from IBM PC CP 850 to ISO8859-1 */ ++ winify = dosify = 1; break; + case 'l': /* Translate end-of-line */ + translate_eol = 1; break; + case o_ll: +@@ -2915,6 +2921,8 @@ char **argv; /* command line + free(value); + have_out = 1; + break; ++ case o_OO: /* ISO8859-2 will be used instead of ISO8859-1 */ ++ iso8859_2 = 1; break; + case 'p': /* Store path with name */ + break; /* (do nothing as annoyance avoidance) */ + case 'P': /* password for encryption */ Index: zip.h =================================================================== ---- zip.h.orig 2005-06-16 05:55:28.000000000 +0200 -+++ zip.h 2009-11-24 18:19:52.770930000 +0100 -@@ -245,9 +245,11 @@ extern ZCONST uch ebcdic[256]; - #endif /* EBCDIC */ +--- zip.h.orig 2008-05-25 19:23:22.000000000 +0200 ++++ zip.h 2010-05-21 18:47:37.339590945 +0200 +@@ -311,9 +311,11 @@ extern ZCONST uch ebcdic[256]; + /* Are these ever used? 6/12/05 EG */ #ifdef IZ_ISO2OEM_ARRAY /* ISO 8859-1 (Win CP 1252) --> OEM CP 850 */ extern ZCONST uch Far iso2oem[128]; +extern ZCONST uch Far iso2oem_2[128]; @@ -202,22 +227,22 @@ extern ZCONST uch Far oem2iso[128]; +extern ZCONST uch Far oem2iso_2[128]; #endif - extern char errbuf[FNMAX+81]; /* Handy place to build error messages */ - extern int recurse; /* Recurse into directories encountered */ -@@ -263,6 +265,8 @@ extern int scanimage; /* Scan - #define DEFLATE 8 /* Deflation method*/ - extern int method; /* Restriction on compression method */ + extern char errbuf[FNMAX+4081]; /* Handy place to build error messages */ +@@ -342,6 +344,8 @@ extern int des_good; /* Good + extern ulg des_crc; /* Data descriptor CRC */ + extern uzoff_t des_csize; /* Data descriptor csize */ + extern uzoff_t des_usize; /* Data descriptor usize */ +extern int winify; /* file names will be converted from IBM PC CP 850 to ISO8859-1 */ -+extern int iso8859_2; /* ISO8859-2 will be used instead of ISO8859-1 */ ++extern int iso8859_2; /* ISO8859-2 will be used instead of ISO8859-1 */ extern int dosify; /* Make new entries look like MSDOS */ extern char *special; /* Don't compress special suffixes */ extern int verbose; /* Report oddities in zip file structure */ Index: unix/Makefile =================================================================== ---- unix/Makefile.orig 2006-04-23 01:52:18.000000000 +0200 -+++ unix/Makefile 2009-11-24 18:19:52.774937000 +0100 -@@ -46,7 +46,7 @@ VERSION = Version 2.32 +--- unix/Makefile.orig 2008-05-07 08:33:56.000000000 +0200 ++++ unix/Makefile 2010-05-21 18:47:37.363590733 +0200 +@@ -57,7 +57,7 @@ IZ_OUR_BZIP2_DIR = bzip2 # CFLAGS flags for C compile # LFLAGS1 flags after output file spec, before obj file list # LFLAGS2 flags after obj file list (libraries, etc) ++++++ zip-2.3-nonexec-stack.patch -> zip-3.0-nonexec-stack.patch ++++++ --- zip/zip-2.3-nonexec-stack.patch 2009-11-24 18:21:17.000000000 +0100 +++ zip/zip-3.0-nonexec-stack.patch 2010-05-21 19:01:19.000000000 +0200 @@ -1,19 +1,15 @@ -Index: crc_i386.S -=================================================================== ---- crc_i386.S.orig 2005-01-29 05:23:28.000000000 +0100 -+++ crc_i386.S 2009-11-24 18:19:53.095928000 +0100 -@@ -238,3 +238,6 @@ _crc32: /* ulg c +--- crc_i386.S ++++ crc_i386.S +@@ -302,3 +302,6 @@ #endif /* i386 || _i386 || _I386 || __i386 */ - #endif /* !USE_ZLIB */ + #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ + +.section .note.GNU-stack, "", @progbits +.previous -Index: match.S -=================================================================== ---- match.S.orig 2005-01-29 06:40:14.000000000 +0100 -+++ match.S 2009-11-24 18:19:53.100930000 +0100 -@@ -405,3 +405,5 @@ L__return: +--- match.S ++++ match.S +@@ -405,3 +405,5 @@ #endif /* i386 || _I386 || _i386 || __i386 */ #endif /* !USE_ZLIB */ ++++++ zip-2.3-optflags.patch -> zip-3.0-optflags.patch ++++++ --- zip/zip-2.3-optflags.patch 2009-11-24 18:21:18.000000000 +0100 +++ zip/zip-3.0-optflags.patch 2010-05-21 19:01:19.000000000 +0200 @@ -1,13 +1,11 @@ -Index: unix/Makefile -=================================================================== ---- unix/Makefile.orig 2009-11-24 18:19:52.774937000 +0100 -+++ unix/Makefile 2009-11-24 18:19:53.326841000 +0100 -@@ -160,7 +160,7 @@ generic: flags - eval $(MAKE) zips `cat flags` +--- unix/Makefile ++++ unix/Makefile +@@ -202,7 +202,7 @@ + eval $(MAKE) $(MAKEF) zips `cat flags` generic_gcc: -- $(MAKE) generic CC=gcc CPP="gcc -E" -+ $(MAKE) generic CPP="gcc -E" +- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E" ++ $(MAKE) $(MAKEF) generic CPP="gcc -E" # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes): att6300nodir: ++++++ zip-2.3-tempfile.patch -> zip-3.0-tempfile.patch ++++++ --- zip/zip-2.3-tempfile.patch 2009-11-24 18:21:18.000000000 +0100 +++ zip/zip-3.0-tempfile.patch 2010-05-21 19:01:20.000000000 +0200 @@ -1,14 +1,9 @@ -Index: fileio.c -=================================================================== ---- fileio.c.orig 2005-06-16 05:31:52.000000000 +0200 -+++ fileio.c 2009-11-24 18:19:52.483933000 +0100 -@@ -919,7 +919,18 @@ char *zip; /* path name of - } - #else +--- fileio.c ++++ fileio.c +@@ -1490,6 +1490,13 @@ strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */ -+#ifdef NO_MKSTEMP - return mktemp(t); -+#else + # if defined(UNIX) && !defined(NO_MKSTEMP) + /* tempname should not be called */ + { + int fd; + @@ -16,8 +11,6 @@ + return NULL; + close(fd); + } -+ return t; -+#endif - #endif /* NO_MKTEMP */ - #endif /* TANDEM */ - #endif /* CMS_MVS */ + return t; + # else + return mktemp(t); ++++++ zip-2.32.tar.bz2 -> zip-3.0.tar.bz2 ++++++ ++++ 79071 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 setserial for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package setserial for openSUSE:Factory checked in at Fri Jul 30 12:57:39 CEST 2010. -------- --- setserial/setserial.changes 2008-09-29 13:50:13.000000000 +0200 +++ setserial/setserial.changes 2010-07-30 09:52:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 30 07:52:32 UTC 2010 - coolo(a)novell.com + +- recent kernels do no longer have linux/hayesesp.h + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- setserial-2.17-nohayes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setserial.spec ++++++ --- /var/tmp/diff_new_pack.zA5sVw/_old 2010-07-30 12:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.zA5sVw/_new 2010-07-30 12:57:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package setserial (Version 2.17) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,13 @@ Name: setserial Version: 2.17 -Release: 716 +Release: 720 Provides: util:/sbin/setserial PreReq: %insserv_prereq Requires: /sbin/isserial AutoReqProv: on Group: Hardware/Other -License: GPL v2 or later +License: GPLv2+ Url: http://setserial.sourceforge.net Summary: A utility for configuring serial ports Source0: ftp://tsx-11.mit.edu/pub/linux/sources/sbin/setserial-%{version}.tar.bz2 @@ -34,6 +34,7 @@ Patch0: %{name}-%{version}-autoconf.diff Patch1: %{name}-%{version}-error.diff Patch2: %{name}-%{version}-prototypes.diff +Patch3: %{name}-%{version}-nohayes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,17 +42,12 @@ port information. Setserial can reveal and allow you to alter the I/O port and IRQ that a particular serial device is using. - - -Authors: --------- - Theodore Ts'o <tytso(a)mit.edu> - %prep %setup -q %patch0 %patch1 %patch2 +%patch3 -p1 %build %suse_update_config ++++++ setserial-2.17-nohayes.diff ++++++ Index: setserial-2.17/setserial.c =================================================================== --- setserial-2.17.orig/setserial.c 2010-07-30 09:28:55.000000000 +0200 +++ setserial-2.17/setserial.c 2010-07-30 09:49:14.371153168 +0200 @@ -359,7 +359,7 @@ void set_multiport(char *device, int fd, } #endif -#ifdef TIOCGHAYESESP +#ifdef HAVE_LINUX_HAYESESP_H void print_hayesesp(int fd) { struct hayes_esp_config esp; @@ -456,7 +456,7 @@ int get_serial(char *device) print_flags(&serinfo, "\tFlags: ", ""); printf("\n\n"); -#ifdef TIOCGHAYESESP +#ifdef HAVE_LINUX_HAYESESP_H print_hayesesp(fd); #endif } else if (verbosity==0) { @@ -598,7 +598,7 @@ int set_serial(char *device, char ** arg } set_multiport(device, fd, &arg); break; -#ifdef TIOCGHAYESESP +#ifdef HAVE_LINUX_HAYESESP_H case CMD_RX_TRIG: case CMD_TX_TRIG: case CMD_FLOW_OFF: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pciutils for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package pciutils for openSUSE:Factory checked in at Fri Jul 30 12:56:57 CEST 2010. -------- --- pciutils/pciutils.changes 2010-04-24 13:57:14.000000000 +0200 +++ pciutils/pciutils.changes 2010-06-28 08:50:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.lbyNiY/_old 2010-07-30 12:56:42.000000000 +0200 +++ /var/tmp/diff_new_pack.lbyNiY/_new 2010-07-30 12:56:42.000000000 +0200 @@ -20,7 +20,7 @@ Name: pciutils Version: 3.1.7 -Release: 2 +Release: 7 BuildRequires: zlib-devel BuildRequires: licenses BuildRequires: pkg-config @@ -88,7 +88,7 @@ %patch1 %build -make %{?jobs:-j%jobs} OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" +make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" %install make install PREFIX=$RPM_BUILD_ROOT%{_prefix} SBINDIR=$RPM_BUILD_ROOT/sbin \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 alsa for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Fri Jul 30 12:46:53 CEST 2010. -------- --- alsa/alsa.changes 2010-04-24 12:57:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2010-05-06 16:27:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 6 16:27:19 CEST 2010 - tiwai(a)suse.de + +- fix the return code of alsasound (bnc#600767) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.e2eHTP/_old 2010-07-30 12:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.e2eHTP/_new 2010-07-30 12:46:24.000000000 +0200 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.23 -Release: 2 +Release: 5 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: baselibs.conf Source8: 40-alsa.rules ++++++ alsasound ++++++ --- /var/tmp/diff_new_pack.e2eHTP/_old 2010-07-30 12:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.e2eHTP/_new 2010-07-30 12:46:24.000000000 +0200 @@ -124,7 +124,7 @@ # hack - in case the mixer isn't restored # this shouldn't be needed anymore since udev cares # (sleep 1; $alsactl -F -f $asoundcfg restore >/dev/null 2>&1) - rc_status + rc_status -r } do_kill() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 udev for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Fri Jul 30 12:46:21 CEST 2010. -------- --- udev/udev.changes 2010-07-14 00:59:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2010-07-24 10:13:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 24 10:12:46 CEST 2010 - kay.sievers(a)novell.com + +- update systemd service installation + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.lpDvV8/_old 2010-07-30 12:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.lpDvV8/_new 2010-07-30 12:46:01.000000000 +0200 @@ -21,7 +21,7 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 160 -Release: 1 +Release: 2 License: LGPLv2.1+ Group: System/Kernel Summary: A rule-based device node and kernel event manager @@ -30,7 +30,6 @@ Conflicts: mkinitrd < 2.5.10-12 Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 -Conflicts: systemd < 3 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel BuildRequires: libusb-devel pciutils-ids usbutils @@ -126,7 +125,7 @@ cp %{S:10} $RPM_BUILD_ROOT/lib/udev/rules.d/ install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev install -m755 -D %{S:61} $RPM_BUILD_ROOT/etc/init.d/boot.udev_retry -# don't run/short-cut sysv init script with different name +# don't run/short-cut old sysv init script with different name ln -s udev-retry.service %{buildroot}/lib/systemd/system/udev_retry.service %pre @@ -143,7 +142,7 @@ %post %{fillup_and_insserv -Y boot.udev} %{fillup_and_insserv -Y boot.udev_retry} -/usr/bin/systemd-install --realize enable udev.service >/dev/null 2>&1 || : +/bin/systemctl enable udev.service >/dev/null 2>&1 || : # add KERNEL name match to existing persistent net rules sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ /etc/udev/rules.d/70-persistent-net.rules >/dev/null 2>&1 || : @@ -166,7 +165,7 @@ %preun if [ "$1" -eq 0 ]; then - /usr/bin/systemd-install --realize disable udev.service >/dev/null 2>&1 || : + /bin/systemctl disable udev.service >/dev/null 2>&1 || : fi %post -n libudev0 -p /sbin/ldconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jasper for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package jasper for openSUSE:Factory checked in at Fri Jul 30 12:46:10 CEST 2010. -------- --- jasper/jasper.changes 2009-12-16 11:17:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/jasper/jasper.changes 2010-07-29 11:05:54.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 29 08:54:37 UTC 2010 - coolo(a)novell.com + +- do not build the highlevel image viewer in a basic library + (in case someone needs it, we better do a 2nd spec file) +- follow shared library policy + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper.spec ++++++ --- /var/tmp/diff_new_pack.ZZHAQp/_old 2010-07-30 12:45:43.000000000 +0200 +++ /var/tmp/diff_new_pack.ZZHAQp/_new 2010-07-30 12:45:43.000000000 +0200 @@ -19,13 +19,13 @@ Name: jasper -BuildRequires: freeglut-devel libdrm-devel libjpeg-devel libstdc++-devel +BuildRequires: gcc-c++ libdrm-devel libjpeg-devel Url: http://www.ece.uvic.ca/~mdadams/jasper/ License: Public Domain, Freeware Group: Productivity/Graphics/Convertors AutoReqProv: on Version: 1.900.1 -Release: 136 +Release: 143 Summary: An Implementation of the JPEG-2000 Standard, Part 1 Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -39,13 +39,7 @@ standard, JPEG-2000, Part 1. It consists of tools for conversion to and from the JP2 and JPC formats. - - -Authors: --------- - Michael D. Adams <mdadams(a)ieee.org> - -%package -n libjasper +%package -n libjasper1 License: Public Domain, Freeware Summary: JPEG-2000 library Group: Productivity/Graphics/Convertors @@ -53,18 +47,15 @@ %ifarch ppc64 Obsoletes: libjasper-64bit %endif +# used in <= 11.3 +Obsoletes: libjasper +Provides: libjasper # -%description -n libjasper +%description -n libjasper1 This package contains libjasper, a library implementing the JPEG-2000 image compression standard Part 1. - - -Authors: --------- - Michael D. Adams <mdadams(a)ieee.org> - %package -n libjasper-devel License: Public Domain, Freeware Summary: JPEG-2000 library - files mandatory for development @@ -74,19 +65,13 @@ Obsoletes: libjasper-devel-64bit %endif # -Requires: libjasper = %{version} +Requires: libjasper1 = %{version} Requires: libjpeg-devel %description -n libjasper-devel This package contains libjasper, a library implementing the JPEG-2000 image compression standard Part 1. - - -Authors: --------- - Michael D. Adams <mdadams(a)ieee.org> - %prep %setup -q %patch @@ -97,7 +82,7 @@ %{suse_update_config} autoreconf -i -f CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=/usr --enable-shared --disable-static --libdir=%{_libdir} -make %{?jobs:-j%jobs}; +make %{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -106,22 +91,19 @@ # compatibility link, there was no interface change ln -s libjasper.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjasper-1.701.so.1 -%post -n libjasper -%run_ldconfig +%post -n libjasper1 -p /sbin/ldconfig -%postun -n libjasper -%run_ldconfig +%postun -n libjasper1 -p /sbin/ldconfig %files %defattr(-,root,root) -%doc COPYRIGHT ChangeLog INSTALL LICENSE NEWS README doc/* +%doc COPYRIGHT INSTALL LICENSE NEWS README doc/* /usr/bin/imgcmp /usr/bin/imginfo /usr/bin/jasper -/usr/bin/jiv %{_mandir}/man*/* -%files -n libjasper +%files -n libjasper1 %defattr(-,root,root) %{_libdir}/libjasper*.so.* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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