April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libsatsolver for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at Fri Apr 30 00:52:53 CEST 2010. -------- --- libsatsolver/libsatsolver.changes 2010-03-23 18:43:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2010-04-30 00:52:30.393647000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 00:52:19 CEST 2010 - ma(a)suse.de + +- added mode ERASECLEAN + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.V5v0Ay/_old 2010-04-30 00:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.V5v0Ay/_new 2010-04-30 00:52:45.000000000 +0200 @@ -19,7 +19,7 @@ Name: libsatsolver Version: 0.14.17 -Release: 1 +Release: 2 License: BSD3c Url: git://git.opensuse.org/projects/zypp/sat-solver.git Source: satsolver-%{version}.tar.bz2 ++++++ satsolver-0.14.17.tar.bz2 ++++++ libsatsolver/satsolver-0.14.17.tar.bz2 /mounts/work_src_done/STABLE/libsatsolver/satsolver-0.14.17.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ca-certificates for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at Fri Apr 30 00:45:25 CEST 2010. -------- --- ca-certificates/ca-certificates.changes 2010-04-21 15:21:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/ca-certificates/ca-certificates.changes 2010-04-27 16:18:53.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 27 14:17:24 UTC 2010 - lnussel(a)suse.de + +- also use hooks from /usr/lib/ca-certificates/update.d +- replace bundle file with symlink to file in /var as it's auto + generated + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.I235Ei/_old 2010-04-30 00:44:53.000000000 +0200 +++ /var/tmp/diff_new_pack.I235Ei/_new 2010-04-30 00:44:53.000000000 +0200 @@ -22,12 +22,12 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define etccadir %{ssletcdir}/certs -%define cabundle %{ssletcdir}/ca-bundle.pem +%define cabundle /var/lib/ca-certificates/ca-bundle.pem %define usrcadir %{_datadir}/ca-certificates License: GPLv2+ Group: Productivity/Networking/Security Version: 1 -Release: 3 +Release: 4 Summary: Utilities for system wide CA certificate installation Source0: update-ca-certificates Source1: update-ca-certificates.8 @@ -61,15 +61,21 @@ mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_mandir}/man8 mkdir -p %{buildroot}/etc/ca-certificates/update.d -install -m 644 /dev/null %{buildroot}/%{cabundle} +mkdir -p %{buildroot}%{_prefix}/lib/ca-certificates/update.d +install -D -m 644 /dev/null %{buildroot}/%{cabundle} install -m 644 /dev/null %{buildroot}/etc/ca-certificates.conf -# TODO: we should put our distros scripts in /usr really -install -m 755 %{SOURCE3} %{buildroot}/etc/ca-certificates/update.d +install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/lib/ca-certificates/update.d +ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem install -m 755 update-ca-certificates %{buildroot}/%{_sbindir} install -m 644 update-ca-certificates.8 %{buildroot}/%{_mandir}/man8 %post +# this is just needed for those updating Factory, +# can be removed before 11.3 +if [ "$1" -ge 1 ]; then + rm -f /etc/ca-certificates/update.d/certbundle.run +fi # force rebuilding all certificate stores. # This also makes sure we update the hash links in /etc/ssl/certs # as openssl changed the hash format between 0.9.8 and 1.0 @@ -84,10 +90,14 @@ %dir %{etccadir} %doc COPYING %ghost %config(noreplace) /etc/ca-certificates.conf +%{ssletcdir}/ca-bundle.pem %ghost %{cabundle} %dir /etc/ca-certificates %dir /etc/ca-certificates/update.d -/etc/ca-certificates/update.d/* +%dir %{_prefix}/lib/ca-certificates +%dir %{_prefix}/lib/ca-certificates/update.d +%dir /var/lib/ca-certificates +%{_prefix}/lib/ca-certificates/update.d/* %{_sbindir}/update-ca-certificates %{_mandir}/man8/update-ca-certificates.8* ++++++ certbundle.run ++++++ --- /var/tmp/diff_new_pack.I235Ei/_old 2010-04-30 00:44:53.000000000 +0200 +++ /var/tmp/diff_new_pack.I235Ei/_new 2010-04-30 00:44:53.000000000 +0200 @@ -3,7 +3,7 @@ shopt -s nullglob -cafile="/etc/ssl/ca-bundle.pem" +cafile="/var/lib/ca-certificates/ca-bundle.pem" cadir="/etc/ssl/certs" for i in "$@"; do ++++++ update-ca-certificates ++++++ --- /var/tmp/diff_new_pack.I235Ei/_old 2010-04-30 00:44:53.000000000 +0200 +++ /var/tmp/diff_new_pack.I235Ei/_new 2010-04-30 00:44:53.000000000 +0200 @@ -30,7 +30,8 @@ use Getopt::Long; my $certsconf = '/etc/ca-certificates.conf'; -my $hooksdir = '/etc/ca-certificates/update.d'; +my $hooksdir1 = '/etc/ca-certificates/update.d'; +my $hooksdir2 = '/usr/lib/ca-certificates/update.d'; my $certsdir = "/usr/share/ca-certificates"; my $localcertsdir = "/usr/local/share/ca-certificates"; my $etccertsdir = "/etc/ssl/certs"; @@ -167,7 +168,7 @@ my @args; push @args, '-f' if $opt_fresh; push @args, '-v' if $opt_verbose; - for my $f (glob "$hooksdir/*.run") { + for my $f (glob("$hooksdir2/*.run"), glob("$hooksdir1/*.run")) { system($f, @args); } } ++++++ update-ca-certificates.8 ++++++ --- /var/tmp/diff_new_pack.I235Ei/_old 2010-04-30 00:44:53.000000000 +0200 +++ /var/tmp/diff_new_pack.I235Ei/_new 2010-04-30 00:44:53.000000000 +0200 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH UPDATE-CA-CERTIFICATES 8 "08 April 2010" +.TH UPDATE-CA-CERTIFICATES 8 "27 April 2010" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,7 +16,7 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -update-ca-certificates \- update /etc/ssl/certs and ca-bundle.pem +update-ca-certificates \- update system CA certificates .SH SYNOPSIS .B update-ca-certificates .RI [ options ] @@ -35,8 +35,8 @@ Furthermore all certificates found below /usr/local/share/ca-certificates are also included as implicitly trusted. .PP -After populating /etc/ssl/certs and creating /etc/ssl/ca-bundle.pem -\fBupdate-ca-certificates\fP invokes custom hooks in +After populating /etc/ssl/certs \fBupdate-ca-certificates\fP invokes +custom hooks in /usr/lib/ca-certificates/update.d/*.run and /etc/ca-certificates/update.d/*.run. The command line options used for invoking update-ca-certificates are passed to the hooks as well. .SH OPTIONS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop slony1 from openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, FYI: Package slony1 was dropped from openSUSE:Factory at Thu Apr 29 12:50:26 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=sl… 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 filesystem for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at Thu Apr 29 01:07:42 CEST 2010. -------- --- filesystem/filesystem.changes 2010-03-09 15:00:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/filesystem/filesystem.changes 2010-04-28 17:06:40.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 28 17:04:20 CEST 2010 - ro(a)suse.de + +- add ghost.list with directories only listed in this package + as ghost files, move /tmp/.X11-unix, /tmp/.ICE-unix + and /var/tmp/vi.recover to that list +- also move /media/cdrom and /media/floppy to that list + they were done manually as ghosts in the specfile before +- add /etc/tmpdirs.d (see aaa_base) + +------------------------------------------------------------------- +Tue Apr 27 10:20:52 UTC 2010 - aj(a)suse.de + +- Set version number to 11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ghost.list ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.KVzhFY/_old 2010-04-29 01:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.KVzhFY/_new 2010-04-29 01:06:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package filesystem (Version 11.2) +# spec file for package filesystem (Version 11.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,14 +23,15 @@ Group: System/Fhs AutoReqProv: on Summary: Basic Directory Layout -Version: 11.2 -Release: 18 +Version: 11.3 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: aaa_dir Provides: aaa_dir Source: directory.list Source1: filesystem.links Source2: languages +Source3: ghost.list Source64: directory.list64 %prep @@ -51,26 +52,26 @@ } rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT +# generic directories first echo "%%defattr(-,root,root)" > filesystem.list { cat %{SOURCE0} %ifarch s390x %sparc x86_64 ppc64 ppc cat %{SOURCE64} %endif -} | -while read MOD OWN GRP NAME ; do +} | while read MOD OWN GRP NAME ; do + create_dir $MOD $OWN $GRP $NAME +done +# ghost files next +cat %{SOURCE3} | while read MOD OWN GRP NAME ; do %ifarch s390 s390x case $NAME in - /media/floppy|/media/cdrom|/floppy|/cdrom) continue ;; + /media/floppy|/media/cdrom) continue ;; esac %endif - case $NAME in - /media/floppy|/media/cdrom) create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost " - continue ;; - esac - create_dir $MOD $OWN $GRP $NAME done +# arch specific leftovers for march in \ %ifarch %ix86 i586-suse-linux \ ++++++ directory.list ++++++ --- /var/tmp/diff_new_pack.KVzhFY/_old 2010-04-29 01:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.KVzhFY/_new 2010-04-29 01:06:55.000000000 +0200 @@ -42,6 +42,7 @@ 0700 root root /etc/sysconfig/network/providers 0755 root root /etc/sysconfig/network/scripts 0755 root root /etc/sysconfig/scripts +0755 root root /etc/tmpdirs.d 0750 news news /etc/news 0755 root root /etc/opt 0750 root dialout /etc/ppp @@ -58,8 +59,6 @@ 0755 root root /lib/modules 0755 root root /lib/firmware 0755 root root /media -0755 root root /media/cdrom -0755 root root /media/floppy 0755 root root /mnt 0755 root root /opt 0555 root root /proc @@ -75,8 +74,6 @@ 0755 root root /srv/www/htdocs 0755 root root /sys 1777 root root /tmp -1777 root root /tmp/.X11-unix -1777 root root /tmp/.ICE-unix 0755 root root /usr 0755 root root /usr/X11R6 0755 root root /usr/X11R6/bin @@ -186,7 +183,6 @@ 0755 uucp uucp /var/spool/uucp 0755 root root /var/spool/uucp/uucp 1777 root root /var/tmp -1777 root root /var/tmp/vi.recover 0755 root root /var/log 0755 root root /var/opt 0700 root root /var/adm/update-scripts ++++++ ghost.list ++++++ 0755 root root /media/cdrom 0755 root root /media/floppy 1777 root root /tmp/.X11-unix 1777 root root /tmp/.ICE-unix 1777 root root /var/tmp/vi.recover ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 device-mapper for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at Thu Apr 29 01:06:34 CEST 2010. -------- --- device-mapper/device-mapper.changes 2010-04-03 05:22:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/device-mapper/device-mapper.changes 2010-04-26 16:52:50.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 26 16:51:40 CEST 2010 - ro(a)suse.de + +- fix pkgconfig file for device mapper + +------------------------------------------------------------------- --- device-mapper/lvm2-clvm.changes 2010-04-05 06:25:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/device-mapper/lvm2-clvm.changes 2010-04-26 16:52:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 26 16:51:35 CEST 2010 - ro(a)suse.de + +- fix lvm2-clvm specfile so that patches apply + +------------------------------------------------------------------- --- device-mapper/lvm2.changes 2010-04-03 05:22:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/device-mapper/lvm2.changes 2010-04-26 16:52:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 26 16:51:10 CEST 2010 - ro(a)suse.de + +- fix lvm2-clvm specfile so that patches apply + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fallback-major-number.diff sigterm_in_main_thread.diff New: ---- device-mapper-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -27,7 +27,7 @@ %endif # Version: 1.02.42 -Release: 1 +Release: 2 Summary: Device Mapper Tools Source: LVM2.2.02.58.tgz Source1: boot.device-mapper @@ -43,6 +43,7 @@ Patch65: device-mapper-dmsetup-deps-export.patch Patch66: device-mapper-type_punning.diff Patch67: udev-rules_update.diff +Patch68: device-mapper-pkgconfig.patch #Patches applies to both LVM2 and device-mapper Patch80: lvm-no_chown.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,6 +84,7 @@ %patch65 -p1 %patch66 -p0 %patch67 -p1 +%patch68 -p0 %patch80 -p0 %build ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -19,12 +19,12 @@ Url: http://sources.redhat.com/cluster/clvm/ Name: lvm2-clvm -BuildRequires: device-mapper-devel libdlm-devel libopenais-devel readline-devel +BuildRequires: device-mapper-devel libcorosync-devel libdlm-devel libopenais-devel readline-devel BuildRequires: libselinux-devel License: GPLv2+ ; LGPLv2.1+ Group: System/Base Version: 2.02.58 -Release: 1 +Release: 2 Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais Provides: clvm PreReq: %fillup_prereq %insserv_prereq @@ -45,7 +45,6 @@ Patch4: sys_mount_instead_linux_fs.diff Patch5: pvscan_2TB_limit.diff Patch6: man_page_sectors.diff -Patch10: lvm-no_chown.diff Patch11: cmdline_large_minor.diff Patch12: enable-clvmd.patch Patch13: pipe_buff-definition.diff @@ -53,11 +52,11 @@ #Patch15: dmeventd-link-libcmd.diff Patch16: clvmd-openais-use-dlm.diff Patch17: bug-486952_clvmd-check-returncode-of-dlmrelease.diff -Patch18: sigterm_in_main_thread.diff Patch19: dont_ignore_tmp_device_file.diff Patch20: support-drbd-filter.diff Patch21: call_cpg_leave_before_shutdown.diff -Patch67: fallback-major-number.diff +Patch63: device-mapper-static.diff +Patch80: lvm-no_chown.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,7 +72,6 @@ %patch4 %patch5 %patch6 -%patch10 %patch11 %patch12 %patch13 @@ -81,11 +79,11 @@ #%patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch67 -p1 +%patch63 -p1 +%patch80 -p0 %build CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.02.58 -Release: 1 +Release: 2 Summary: LVM2 Tools Source: LVM2.%{version}.tgz Source1: lvm.conf ++++++ bug-486952_clvmd-check-returncode-of-dlmrelease.diff ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -1,10 +1,10 @@ Index: LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -=================================================================== ---- LVM2.2.02.45.orig/daemons/clvmd/clvmd-openais.c -+++ LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -@@ -371,7 +371,16 @@ static void _cluster_closedown(void) +================================================================================ +--- LVM2.2.02.58/daemons/clvmd/clvmd-openais.c ++++ LVM2.2.02.58/daemons/clvmd/clvmd-openais.c +@@ -380,7 +380,16 @@ DEBUGLOG("cluster_closedown\n"); - unlock_all(); + destroy_lvhash(); - dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0); + int r; ++++++ call_cpg_leave_before_shutdown.diff ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -1,8 +1,8 @@ Index: LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -=================================================================== ---- LVM2.2.02.45.orig/daemons/clvmd/clvmd-openais.c -+++ LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -@@ -345,7 +345,7 @@ static int _init_cluster(void) +================================================================================ +--- LVM2.2.02.58/daemons/clvmd/clvmd-openais.c ++++ LVM2.2.02.58/daemons/clvmd/clvmd-openais.c +@@ -354,7 +354,7 @@ err = cpg_join(cpg_handle, &cpg_group_name); if (err != SA_AIS_OK) { cpg_finalize(cpg_handle); @@ -11,7 +11,7 @@ syslog(LOG_ERR, "Cannot join clvmd process group"); DEBUGLOG("Cannot join clvmd process group: %d\n", err); return ais_to_errno(err); -@@ -354,8 +354,9 @@ static int _init_cluster(void) +@@ -363,8 +363,9 @@ err = cpg_local_get(cpg_handle, &our_nodeid); if (err != SA_AIS_OK) { @@ -22,8 +22,8 @@ syslog(LOG_ERR, "Cannot get local node id\n"); return ais_to_errno(err); } -@@ -372,15 +373,11 @@ static void _cluster_closedown(void) - unlock_all(); +@@ -381,15 +382,11 @@ + destroy_lvhash(); int r; - r = dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0); ++++++ clvmd-openais-use-dlm.diff ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -1,8 +1,34 @@ Index: LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -=================================================================== ---- LVM2.2.02.45.orig/daemons/clvmd/clvmd-openais.c -+++ LVM2.2.02.45/daemons/clvmd/clvmd-openais.c -@@ -38,9 +38,9 @@ +================================================================================ +--- LVM2.2.02.58/daemons/clvmd/Makefile.in ++++ LVM2.2.02.58/daemons/clvmd/Makefile.in +@@ -59,7 +59,7 @@ + + ifneq (,$(findstring openais,, "@CLVMD@,")) + SOURCES += clvmd-openais.c +- LMLIBS += $(CONFDB_LIBS) $(CPG_LIBS) $(SALCK_LIBS) ++ LMLIBS += $(CONFDB_LIBS) -ldlm $(CPG_LIBS) + CFLAGS += $(CONFDB_CFLAGS) $(CPG_CFLAGS) $(SALCK_CFLAGS) + DEFS += -DUSE_OPENAIS + endif +--- LVM2.2.02.58/daemons/clvmd/clvm.h ++++ LVM2.2.02.58/daemons/clvmd/clvm.h +@@ -80,6 +80,7 @@ + /* Locking flags - these match the ones + * in dlm.h + */ ++#ifndef LKF_NOQUEUE + #define LKF_NOQUEUE (0x00000001) + #define LKF_CANCEL (0x00000002) + #define LKF_CONVERT (0x00000004) +@@ -95,3 +96,4 @@ + #define LKF_HEADQUE (0x00001000) + #define LKF_NOORDER (0x00002000) + #endif ++#endif +--- LVM2.2.02.58/daemons/clvmd/clvmd-openais.c ++++ LVM2.2.02.58/daemons/clvmd/clvmd-openais.c +@@ -44,9 +44,9 @@ #include <syslog.h> #include <assert.h> #include <libdevmapper.h> @@ -10,19 +36,19 @@ #include <openais/saAis.h> -#include <openais/saLck.h> - #include <openais/cpg.h> - #include "locking.h" -@@ -53,6 +53,8 @@ + #include <corosync/corotypes.h> + #include <corosync/cpg.h> +@@ -61,6 +61,8 @@ /* Timeout value for several openais calls */ #define TIMEOUT 10 +#define LOCKSPACE_NAME "clvmd" + - static void cpg_deliver_callback (cpg_handle_t handle, - struct cpg_name *groupName, + static void openais_cpg_deliver_callback (cpg_handle_t handle, + const struct cpg_name *groupName, uint32_t nodeid, -@@ -69,9 +71,6 @@ static void _cluster_closedown(void); +@@ -78,9 +80,6 @@ /* Hash list of nodes in the cluster */ static struct dm_hash_table *node_hash; @@ -32,7 +58,7 @@ /* Number of active nodes */ static int num_nodes; static unsigned int our_nodeid; -@@ -80,9 +79,15 @@ static struct local_client *cluster_clie +@@ -89,9 +88,15 @@ /* OpenAIS handles */ static cpg_handle_t cpg_handle; @@ -48,8 +74,8 @@ +}; /* Openais callback structs */ - cpg_callbacks_t cpg_callbacks = { -@@ -96,13 +101,6 @@ struct node_info + cpg_callbacks_t openais_cpg_callbacks = { +@@ -105,13 +110,6 @@ int nodeid; }; @@ -63,7 +89,7 @@ /* Set errno to something approximating the right value and return 0 or -1 */ static int ais_to_errno(SaAisErrorT err) { -@@ -312,22 +310,11 @@ static void cpg_confchg_callback(cpg_han +@@ -321,22 +319,11 @@ num_nodes = member_list_entries; } @@ -85,8 +111,8 @@ - lock_hash = dm_hash_create(10); err = cpg_initialize(&cpg_handle, - &cpg_callbacks); -@@ -338,16 +325,19 @@ static int _init_cluster(void) + &openais_cpg_callbacks); +@@ -347,16 +334,19 @@ return ais_to_errno(err); } @@ -94,7 +120,7 @@ - NULL, - &ver); - if (err != SA_AIS_OK) { -- cpg_initialize(&cpg_handle, &cpg_callbacks); +- cpg_initialize(&cpg_handle, &openais_cpg_callbacks); - syslog(LOG_ERR, "Cannot initialise OpenAIS lock service: %d", - err); - DEBUGLOG("Cannot initialise OpenAIS lock service: %d\n\n", err); @@ -115,7 +141,7 @@ /* Connect to the clvmd group */ strcpy((char *)cpg_group_name.value, "clvmd"); -@@ -355,7 +345,7 @@ static int _init_cluster(void) +@@ -364,7 +354,7 @@ err = cpg_join(cpg_handle, &cpg_group_name); if (err != SA_AIS_OK) { cpg_finalize(cpg_handle); @@ -124,7 +150,7 @@ syslog(LOG_ERR, "Cannot join clvmd process group"); DEBUGLOG("Cannot join clvmd process group: %d\n", err); return ais_to_errno(err); -@@ -365,15 +355,12 @@ static int _init_cluster(void) +@@ -374,15 +364,12 @@ &our_nodeid); if (err != SA_AIS_OK) { cpg_finalize(cpg_handle); @@ -141,16 +167,16 @@ DEBUGLOG("Connected to OpenAIS\n"); return 0; -@@ -384,7 +371,7 @@ static void _cluster_closedown(void) +@@ -393,7 +380,7 @@ DEBUGLOG("cluster_closedown\n"); - unlock_all(); + destroy_lvhash(); - saLckFinalize(lck_handle); + dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0); cpg_finalize(cpg_handle); } -@@ -475,156 +462,69 @@ static int _cluster_do_node_callback(str +@@ -484,156 +471,69 @@ return somedown; } @@ -346,33 +372,3 @@ } /* We are always quorate ! */ -Index: LVM2.2.02.45/daemons/clvmd/Makefile.in -=================================================================== ---- LVM2.2.02.45.orig/daemons/clvmd/Makefile.in -+++ LVM2.2.02.45/daemons/clvmd/Makefile.in -@@ -69,7 +69,7 @@ endif - - ifeq ("$(OPENAIS)", "yes") - SOURCES += clvmd-openais.c -- LMLIBS += -lSaLck -lcpg -+ LMLIBS += -ldlm -lcpg - DEFS += -DUSE_OPENAIS - endif - -Index: LVM2.2.02.45/daemons/clvmd/clvm.h -=================================================================== ---- LVM2.2.02.45.orig/daemons/clvmd/clvm.h -+++ LVM2.2.02.45/daemons/clvmd/clvm.h -@@ -79,6 +79,7 @@ static const char CLVMD_SOCKNAME[] = "\0 - /* Locking flags - these match the ones - * in dlm.h - */ -+#ifndef LKF_NOQUEUE - #define LKF_NOQUEUE (0x00000001) - #define LKF_CANCEL (0x00000002) - #define LKF_CONVERT (0x00000004) -@@ -94,3 +95,4 @@ static const char CLVMD_SOCKNAME[] = "\0 - #define LKF_HEADQUE (0x00001000) - #define LKF_NOORDER (0x00002000) - #endif -+#endif ++++++ device-mapper-pkgconfig.patch ++++++ --- daemons/dmeventd/libdevmapper-event.pc.in +++ daemons/dmeventd/libdevmapper-event.pc.in @@ -5,7 +5,7 @@ Name: devmapper-event Description: device-mapper event library -Version: @DM_LIB_VERSION@ +Version: @DM_LIB_PATCHLEVEL@ Requires: devmapper Cflags: -I${includedir} Libs: -L${libdir} -ldevmapper-event ++++++ enable-clvmd.patch ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -1,34 +1,8 @@ Index: daemons/clvmd/clvmd.c -=================================================================== ---- daemons/clvmd/clvmd.c.orig -+++ daemons/clvmd/clvmd.c -@@ -44,7 +44,7 @@ - #include <syslog.h> - #include <errno.h> - #include <limits.h> --#include <libdlm.h> -+//#include <libdlm.h> - - #include "clvmd-comms.h" - #include "lvm-functions.h" -Index: daemons/clvmd/clvmd-command.c -=================================================================== ---- daemons/clvmd/clvmd-command.c.orig -+++ daemons/clvmd/clvmd-command.c -@@ -69,7 +69,7 @@ - #include <unistd.h> - #include <errno.h> - #include <libdevmapper.h> --#include <libdlm.h> -+//#include <libdlm.h> - - #include "locking.h" - #include "lvm-logging.h" -Index: daemons/clvmd/clvm.h -=================================================================== ---- daemons/clvmd/clvm.h.orig +================================================================================ +--- daemons/clvmd/clvm.h +++ daemons/clvmd/clvm.h -@@ -68,4 +68,29 @@ static const char CLVMD_SOCKNAME[] = "\0 +@@ -69,4 +69,29 @@ #define CLVMD_CMD_GET_CLUSTERNAME 41 #define CLVMD_CMD_SET_DEBUG 42 #define CLVMD_CMD_VG_BACKUP 43 @@ -58,9 +32,28 @@ +#define LKF_HEADQUE (0x00001000) +#define LKF_NOORDER (0x00002000) #endif -Index: daemons/clvmd/lvm-functions.c -=================================================================== ---- daemons/clvmd/lvm-functions.c.orig +--- daemons/clvmd/clvmd-command.c ++++ daemons/clvmd/clvmd-command.c +@@ -69,7 +69,7 @@ + #include <unistd.h> + #include <errno.h> + #include <libdevmapper.h> +-#include <libdlm.h> ++//#include <libdlm.h> + + #include "locking.h" + #include "lvm-logging.h" +--- daemons/clvmd/clvmd.c ++++ daemons/clvmd/clvmd.c +@@ -44,6 +44,7 @@ + #include <syslog.h> + #include <errno.h> + #include <limits.h> ++//#include <libdlm.h> + #ifdef HAVE_COROSYNC_CONFDB_H + #include <corosync/confdb.h> + #endif +--- daemons/clvmd/lvm-functions.c +++ daemons/clvmd/lvm-functions.c @@ -35,7 +35,7 @@ #include <syslog.h> ++++++ support-drbd-filter.diff ++++++ --- /var/tmp/diff_new_pack.uuCLIm/_old 2010-04-29 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.uuCLIm/_new 2010-04-29 01:03:46.000000000 +0200 @@ -1,10 +1,25 @@ This is still very primitive support of drbd in lvm2. Can we use some /sys information for this ? Index: LVM2.2.02.58/lib/cache/lvmcache.c -=================================================================== ---- LVM2.2.02.58.orig/lib/cache/lvmcache.c 2010-01-12 03:12:25.000000000 +0800 -+++ LVM2.2.02.58/lib/cache/lvmcache.c 2010-02-04 16:03:13.000000000 +0800 -@@ -1242,6 +1242,12 @@ +================================================================================ +--- LVM2.2.02.58/lib/cache/lvmcache.c ++++ LVM2.2.02.58/lib/cache/lvmcache.c +@@ -1222,6 +1222,14 @@ + dev_subsystem_name(existing->dev), + dev_name(existing->dev)); + return NULL; ++ } else if (MAJOR(existing->dev->dev) == drbd_major() && ++ MAJOR(dev->dev) != drbd_major()) { ++ log_very_verbose("Ignoring duplicate PV %s on " ++ "%s - using drbd %s", ++ pvid, dev_name(dev), ++ dev_name(existing->dev)); ++ return NULL; ++ + } else if (dm_is_dm_major(MAJOR(existing->dev->dev)) && + !dm_is_dm_major(MAJOR(dev->dev))) { + log_very_verbose("Ignoring duplicate PV %s on " +@@ -1242,6 +1250,12 @@ "using dm %s", pvid, dev_name(existing->dev), dev_name(dev)); @@ -17,3 +32,19 @@ /* FIXME If both dm, check dependencies */ //else if (dm_is_dm_major(MAJOR(existing->dev->dev)) && //dm_is_dm_major(MAJOR(dev->dev))) +--- LVM2.2.02.58/lib/filters/filter.c ++++ LVM2.2.02.58/lib/filters/filter.c +@@ -54,6 +54,13 @@ + return _md_major; + } + ++/* FIXME: Should we consider filter out non-primary ++ drbd resource ?? */ ++int drbd_major(void) ++{ ++ return _drbd_major; ++} ++ + int blkext_major(void) + { + return _blkext_major; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Thu Apr 29 01:03:29 CEST 2010. -------- --- aaa_base/aaa_base.changes 2010-04-27 12:19:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-04-28 16:45:43.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 28 16:45:04 CEST 2010 - ro(a)suse.de + +- added /etc/tmpdirs.d for snippets to be called by boot.cleanup + (shell scripts to recreate things in /tmp, /var/tmp, /var/run) +- move code from boot.cleanup to /etc/tmpdirs.d/01_aaa_base + (all related to fate#303793) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.cKcQyi/_old 2010-04-29 01:00:18.000000000 +0200 +++ /var/tmp/diff_new_pack.cKcQyi/_new 2010-04-29 01:00:18.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv AutoReqProv: on Version: 11.3 -Release: 1 +Release: 2 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.cleanup new/aaa_base/etc/init.d/boot.cleanup --- old/aaa_base/etc/init.d/boot.cleanup 2010-03-29 14:12:15.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.cleanup 2010-04-28 16:36:49.000000000 +0200 @@ -85,12 +85,8 @@ rc_status -v -r fi fi - for CURDIR in /tmp /tmp/.X11-unix /tmp/.ICE-unix \ - /var/tmp /var/tmp/vi.recover /var/run/uscreens ; do - test -d $CURDIR || mkdir -m 1777 $CURDIR - done - for CURDIR in /var/run/screens ; do - test -d $CURDIR || mkdir -m 755 $CURDIR + for script in /etc/tmpdirs.d/* ; do + test -f $script && builtin . $script done fi ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/tmpdirs.d/01_aaa_base new/aaa_base/etc/tmpdirs.d/01_aaa_base --- old/aaa_base/etc/tmpdirs.d/01_aaa_base 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/etc/tmpdirs.d/01_aaa_base 2010-04-28 16:36:26.000000000 +0200 @@ -0,0 +1,8 @@ +test -d /tmp || mkdir -m 1777 /tmp +test -d /tmp/.ICE-unix || mkdir -m 1777 /tmp/.ICE-unix +test -d /tmp/.X11-unix || mkdir -m 1777 /tmp/.X11-unix +test -d /var/run || mkdir -m 755 /var/run +test -d /var/run/screens || mkdir -m 755 /var/run/screens +test -d /var/run/uscreens || mkdir -m 1777 /var/run/uscreens +test -d /var/tmp || mkdir -m 1777 /var/tmp +test -d /var/tmp/vi.recover || mkdir -m 1777 /var/tmp/vi.recover ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xsp for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package xsp for openSUSE:Factory checked in at Thu Apr 29 00:42:25 CEST 2010. -------- --- xsp/xsp.changes 2010-03-16 17:32:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/xsp/xsp.changes 2010-04-28 01:03:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 27 23:02:51 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.6.4 + * http://www.mono-project.com/Release_Notes_Mono_2.6.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xsp-2.6.3.tar.bz2 New: ---- xsp-2.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.5y2wVE/_old 2010-04-29 00:36:48.000000000 +0200 +++ /var/tmp/diff_new_pack.5y2wVE/_new 2010-04-29 00:36:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xsp (Version 2.6.3) +# spec file for package xsp (Version 2.6.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: MIT Group: Productivity/Networking/Web/Servers AutoReqProv: on -Version: 2.6.3 +Version: 2.6.4 Release: 1 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.bz2 ++++++ xsp-2.6.3.tar.bz2 -> xsp-2.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/ChangeLog new/xsp-2.6.4/ChangeLog --- old/xsp-2.6.3/ChangeLog 2010-03-09 15:12:37.000000000 +0100 +++ new/xsp-2.6.4/ChangeLog 2010-04-13 19:46:53.000000000 +0200 @@ -1,3 +1,19 @@ +2010-04-13 Marek Habersack <mhabersack(a)novell.com> + + * ModMonoRequest.cs: SendResponseFromMemory must advance the + pointer when not on Linux. + +2010-03-31 Marek Habersack <mhabersack(a)novell.com> + + * man/xsp.1.in: updated documentation of the --nonstop + option. Fixes bug #585295 + + * src/Mono.WebServer.Apache/main.cs: added --pidfile argument, which + puts mod-mono-server's PID in the specified file. + + * src/Mono.WebServer.XSP/main.cs: wrapped --pidfile option body in + try/catch block, as the failure to create the PID file is not critical. + 2010-03-09 Marek Habersack <mhabersack(a)novell.com> * ModMonoRequest.cs: better fix for bug #580086. Patch from Asgeir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/configure new/xsp-2.6.4/configure --- old/xsp-2.6.3/configure 2010-03-09 17:29:28.000000000 +0100 +++ new/xsp-2.6.4/configure 2010-04-13 19:46:58.000000000 +0200 @@ -2250,7 +2250,7 @@ # Define the identity of the package. PACKAGE=xsp - VERSION=2.6.3 + VERSION=2.6.4 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/configure.in new/xsp-2.6.4/configure.in --- old/xsp-2.6.3/configure.in 2010-03-01 20:34:00.000000000 +0100 +++ new/xsp-2.6.4/configure.in 2010-04-06 00:09:27.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.57) AC_INIT(src/Mono.WebServer.XSP/main.cs) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(xsp, 2.6.3) +AM_INIT_AUTOMAKE(xsp, 2.6.4) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/man/xsp.1.in new/xsp-2.6.4/man/xsp.1.in --- old/xsp-2.6.3/man/xsp.1.in 2009-09-25 17:26:30.000000000 +0200 +++ new/xsp-2.6.4/man/xsp.1.in 2010-04-06 00:09:27.000000000 +0200 @@ -103,7 +103,7 @@ need to provide a list of applications to start. This applies only to mod-mono-server.exe. .I \-\-nonstop -This applies only to xsp.exe: by default xsp will stop processing +By default xsp/mod-mono-server will stop processing requests when the return key is pressed. Use this to avoid this behavior. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.Apache/ModMonoRequest.cs new/xsp-2.6.4/src/Mono.WebServer.Apache/ModMonoRequest.cs --- old/xsp-2.6.3/src/Mono.WebServer.Apache/ModMonoRequest.cs 2010-03-09 17:29:23.000000000 +0100 +++ new/xsp-2.6.4/src/Mono.WebServer.Apache/ModMonoRequest.cs 2010-04-13 19:46:53.000000000 +0200 @@ -322,6 +322,7 @@ byte [] buf = writer_ms.GetBuffer (); Marshal.Copy (ptr, buf, 0, size); length -= size; + unsafe { ptr = (IntPtr)((byte*)ptr.ToPointer () + size); } client.Send (buf, size, SocketFlags.None); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.Apache/main.cs new/xsp-2.6.4/src/Mono.WebServer.Apache/main.cs --- old/xsp-2.6.3/src/Mono.WebServer.Apache/main.cs 2009-09-25 17:26:30.000000000 +0200 +++ new/xsp-2.6.4/src/Mono.WebServer.Apache/main.cs 2010-03-31 14:15:41.000000000 +0200 @@ -127,6 +127,7 @@ Console.WriteLine (); Console.WriteLine (" --version: displays version information and exits."); Console.WriteLine (" --verbose: prints extra messages. Mainly useful for debugging."); + Console.WriteLine (" --pidfile file: write the process PID to the specified file."); Console.WriteLine (); } @@ -277,6 +278,18 @@ case "--verbose": verbose = true; break; + case "--pidfile": { + string pidfile = args[++i]; + if (pidfile != null && pidfile.Length > 0) { + try { + using (StreamWriter sw = File.CreateText (pidfile)) + sw.Write (Process.GetCurrentProcess ().Id); + } catch (Exception ex) { + Console.Error.WriteLine ("Failed to write pidfile {0}: {1}", pidfile, ex.Message); + } + } + break; + } case "--no-hidden": MonoWorkerRequest.CheckFileAccess = false; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.XSP/main.cs new/xsp-2.6.4/src/Mono.WebServer.XSP/main.cs --- old/xsp-2.6.3/src/Mono.WebServer.XSP/main.cs 2009-09-25 17:26:30.000000000 +0200 +++ new/xsp-2.6.4/src/Mono.WebServer.XSP/main.cs 2010-03-31 14:15:41.000000000 +0200 @@ -361,10 +361,14 @@ settings.Verbose = true; break; case "--pidfile": { - string portfile = args[++i]; - if (portfile != null && portfile.Length > 0) { - using (StreamWriter sw = File.CreateText (portfile)) - sw.Write (Process.GetCurrentProcess ().Id); + string pidfile = args[++i]; + if (pidfile != null && pidfile.Length > 0) { + try { + using (StreamWriter sw = File.CreateText (pidfile)) + sw.Write (Process.GetCurrentProcess ().Id); + } catch (Exception ex) { + Console.Error.WriteLine ("Failed to write pidfile {0}: {1}", pidfile, ex.Message); + } } break; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mono-core for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package mono-core for openSUSE:Factory checked in at Thu Apr 29 00:36:28 CEST 2010. -------- --- mono-core/mono-core.changes 2010-04-02 18:40:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/mono-core/mono-core.changes 2010-04-28 11:40:55.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 28 07:59:02 UTC 2010 - aj(a)suse.de + +- Remove libmono-profiler-*.la files. + +------------------------------------------------------------------- +Tue Apr 27 22:58:13 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.6.4 + * http://www.mono-project.com/Release_Notes_Mono_2.6.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mono-2.6.3.tar.bz2 New: ---- mono-2.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.01mR7C/_old 2010-04-29 00:33:33.000000000 +0200 +++ /var/tmp/diff_new_pack.01mR7C/_new 2010-04-29 00:33:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mono-core (Version 2.6.3) +# spec file for package mono-core (Version 2.6.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ Group: Development/Languages/Mono Summary: A .NET Runtime Environment Url: http://go-mono.org/ -Version: 2.6.3 -Release: 3 +Version: 2.6.4 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 ExclusiveArch: %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x @@ -110,8 +110,8 @@ # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif -%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}%{_bindir}/mono-find-provides ; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}%{_bindir}/mono-find-requires ; } | sort | uniq' +%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-provides ; } | sort | uniq' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-requires ; } | sort | uniq' %description The Mono Project is an open development initiative that is working to @@ -377,7 +377,6 @@ %_prefix/lib/mono/2.0/System.Data.dll %_prefix/lib/mono/gac/System.Data.Linq %_prefix/lib/mono/2.0/System.Data.Linq.dll -%_prefix/lib/mono/gac/System.Data.Services %_prefix/lib/mono/gac/Mono.Data %_prefix/lib/mono/1.0/Mono.Data.dll %_prefix/lib/mono/2.0/Mono.Data.dll @@ -629,6 +628,7 @@ %files -n mono-wcf %defattr(-, root, root) %_bindir/svcutil +%_prefix/lib/mono/gac/System.Data.Services %_prefix/lib/mono/gac/System.IdentityModel %_prefix/lib/mono/2.0/System.IdentityModel.dll %_prefix/lib/mono/gac/System.IdentityModel.Selectors @@ -945,7 +945,8 @@ Summary: Mono development tools Group: Development/Languages/Mono Requires: mono-core == %version-%release -Requires: glib2-devel +Recommends: glib2-devel +Requires: pkgconfig # Required because they are referenced by .pc files Requires: mono-data == %version-%release Requires: mono-data-oracle == %version-%release @@ -1316,6 +1317,9 @@ rm -f $RPM_BUILD_ROOT%_prefix/lib/mono/2.0/transform.exe # Post 2.2 rm -f $RPM_BUILD_ROOT%_mandir/man1/monoburg.* +rm -f $RPM_BUILD_ROOT%_libdir/libmono-profiler-aot.la +rm -f $RPM_BUILD_ROOT%_libdir/libmono-profiler-cov.la +rm -f $RPM_BUILD_ROOT%_libdir/libmono-profiler-logging.la # brp-compress doesn't search _mandir # so we cheat it ln -s . %buildroot%_prefix/usr ++++++ mono-2.6.3.tar.bz2 -> mono-2.6.4.tar.bz2 ++++++ mono-core/mono-2.6.3.tar.bz2 /mounts/work_src_done/STABLE/mono-core/mono-2.6.4.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libgdiplus0 for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package libgdiplus0 for openSUSE:Factory checked in at Thu Apr 29 00:31:19 CEST 2010. -------- --- libgdiplus0/libgdiplus0.changes 2010-04-27 14:56:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgdiplus0/libgdiplus0.changes 2010-04-28 00:57:48.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 27 22:55:04 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.6.4 + * http://www.mono-project.com/Release_Notes_Mono_2.6.4 +- Obsolete png patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgdiplus-2.6.2.tar.bz2 png14.patch New: ---- libgdiplus-2.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdiplus0.spec ++++++ --- /var/tmp/diff_new_pack.2bSN17/_old 2010-04-29 00:31:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2bSN17/_new 2010-04-29 00:31:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgdiplus0 (Version 2.6.2) +# spec file for package libgdiplus0 (Version 2.6.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,11 @@ %define system_cairo 0 Name: libgdiplus0 -Version: 2.6.2 -Release: 3 +Version: 2.6.4 +Release: 1 License: LGPLv2.1 ; MPL ; MIT License (or similar) Url: http://go-mono.org/ Source0: %{real_name}-%{version}.tar.bz2 -Patch1: png14.patch Summary: Open Source Implementation of the GDI+ API Group: Development/Libraries/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +45,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-libXrender-devel %description @@ -65,13 +65,10 @@ %files %defattr(-, root, root) %_libdir/libgdiplus.so* -# %doc AUTHORS COPYING ChangeLog* NEWS README %prep %setup -q -n %{real_name}-%{version} -%patch1 -p0 -sed -i -e 's|libpng12|libpng14|' configure %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ libgdiplus-2.6.2.tar.bz2 -> libgdiplus-2.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgdiplus-2.6.2/configure new/libgdiplus-2.6.4/configure --- old/libgdiplus-2.6.2/configure 2010-02-03 01:11:40.000000000 +0100 +++ new/libgdiplus-2.6.4/configure 2010-04-13 13:30:18.000000000 +0200 @@ -2560,7 +2560,7 @@ # Define the identity of the package. PACKAGE=libgdiplus - VERSION=2.6.2 + VERSION=2.6.4 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgdiplus-2.6.2/configure.in new/libgdiplus-2.6.4/configure.in --- old/libgdiplus-2.6.2/configure.in 2010-02-02 19:24:29.000000000 +0100 +++ new/libgdiplus-2.6.4/configure.in 2010-04-06 00:08:25.000000000 +0200 @@ -1,7 +1,7 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libgdiplus,2.6.2) +AM_INIT_AUTOMAKE(libgdiplus,2.6.4) AM_MAINTAINER_MODE AM_PROG_LIBTOOL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgdiplus-2.6.2/src/ChangeLog new/libgdiplus-2.6.4/src/ChangeLog --- old/libgdiplus-2.6.2/src/ChangeLog 2010-01-13 16:45:05.000000000 +0100 +++ new/libgdiplus-2.6.4/src/ChangeLog 2010-04-13 02:56:07.000000000 +0200 @@ -1,3 +1,14 @@ +2010-04-12 Sebastien Pouliot <sebastien(a)ximian.com> + + * pngcodec.c: SuSE provided patch for newer libpng (1.4.x). Made + to be backward compatible with 1.2.x + [Backport r155275] + +2010-03-26 Miguel de Icaza <miguel(a)novell.com> + + * Apply patch from Matthew Metnetsky which fixes 590503, + GdipCloneImage not cloning the properties. + 2010-01-13 Sebastien Pouliot <sebastien(a)ximian.com> * tiffcodec.c: Don't call TIFFClose with a NULL value. Fix #569940 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgdiplus-2.6.2/src/bitmap.c new/libgdiplus-2.6.4/src/bitmap.c --- old/libgdiplus-2.6.2/src/bitmap.c 2009-09-25 17:06:51.000000000 +0200 +++ new/libgdiplus-2.6.4/src/bitmap.c 2010-03-26 18:41:42.000000000 +0100 @@ -147,7 +147,7 @@ GdipFree (result); return OutOfMemory; } - + memcpy(result[i].value, src[i].value, src[i].length); } else { result[i].value = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgdiplus-2.6.2/src/pngcodec.c new/libgdiplus-2.6.4/src/pngcodec.c --- old/libgdiplus-2.6.2/src/pngcodec.c 2009-09-25 17:06:51.000000000 +0200 +++ new/libgdiplus-2.6.4/src/pngcodec.c 2010-04-13 13:30:06.000000000 +0200 @@ -352,7 +352,11 @@ info_ptr->palette[i].blue, info_ptr->palette[i].green, info_ptr->palette[i].red, +#if PNG_LIBPNG_VER > 10243 + info_ptr->trans_alpha [i]); /* alpha */ +#else info_ptr->trans[i]); /* alpha */ +#endif } } @@ -418,7 +422,11 @@ } if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { +#if PNG_LIBPNG_VER > 10243 + png_set_expand_gray_1_2_4_to_8 (png_ptr); +#else png_set_gray_1_2_4_to_8(png_ptr); +#endif } if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '10

28 Apr '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Thu Apr 29 00:29:34 CEST 2010. -------- --- aaa_base/aaa_base.changes 2010-04-27 12:07:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-04-27 12:19:57.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 27 10:19:52 UTC 2010 - aj(a)suse.de + +- Set version number to 11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.mEH3cq/_old 2010-04-29 00:29:14.000000000 +0200 +++ /var/tmp/diff_new_pack.mEH3cq/_new 2010-04-29 00:29:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aaa_base (Version 11.2) +# spec file for package aaa_base (Version 11.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Recommends: cron logrotate netcfg udev net-tools PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv AutoReqProv: on -Version: 11.2 -Release: 69 +Version: 11.3 +Release: 1 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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