September 2010 - openSUSE Commits - openSUSE Mailing Lists

drop decibel from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package decibel was dropped from openSUSE:Factory at Mon Sep 27 17:41:51 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=de… 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 gpsdrive from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package gpsdrive was dropped from openSUSE:Factory at Mon Sep 27 17:41:34 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=gp… 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 cron from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package cron was dropped from openSUSE:Factory at Mon Sep 27 17:41:17 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=cr… 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 gst-rtsp for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package gst-rtsp for openSUSE:Factory checked in at Mon Sep 27 17:40:43 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gst-rtsp/gst-rtsp.changes 2010-09-03 15:38:23.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Sep 3 10:31:59 CEST 2010 - vuntz(a)opensuse.org + +- Initial package (version 0.10.5). + calling whatdependson for head-i586 New: ---- gst-rtsp-0.10.5.tar.bz2 gst-rtsp-fix-vala-detection.patch gst-rtsp.changes gst-rtsp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gst-rtsp.spec ++++++ # # spec file for package gst-rtsp (Version 0.10.5) # # 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/ # Name: gst-rtsp Version: 0.10.5 Release: 1 License: LGPLv2+ Summary: GStreamer based RTSP server library Url: http://gstreamer.freedesktop.org/ Group: Productivity/Multimedia/Other Source0: http://www.gstreamer.net/src/gst-rtsp/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gst-rtsp-fix-vala-detection.patch bgo#628676 vuntz(a)opensuse.org -- Fix vala detection Patch0: gst-rtsp-fix-vala-detection.patch BuildRequires: python-devel BuildRequires: vala-devel BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gst-python-0.10) BuildRequires: pkgconfig(pygobject-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GstRTSP is a RTSP server library using the GStreamer framework. %package -n libgstrtspserver-0_10-0 License: LGPLv2+ Summary: GStreamer based RTSP server library Group: System/Libraries %description -n libgstrtspserver-0_10-0 GstRTSP is a RTSP server library using the GStreamer framework. %package -n libgstrtspserver-0_10-devel License: LGPLv2+ Summary: GStreamer based RTSP server library -- Development Files Group: Development/Libraries/C and C++ Requires: libgstrtspserver-0_10-0 = %{version} %description -n libgstrtspserver-0_10-devel GstRTSP is a RTSP server library using the GStreamer framework. %package -n python-gstreamer-0_10-plugin-rtspserver License: LGPLv2+ Summary: GStreamer based RTSP server library -- Python Bindings Group: Development/Languages/Python Requires: python-gstreamer-0_10 %py_requires %description -n python-gstreamer-0_10-plugin-rtspserver GstRTSP is a RTSP server library using the GStreamer framework. %prep %setup -q %patch0 -p1 %build autoreconf -fi %configure --disable-static %__make %{?_smp_mflags} V=1 %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %clean rm -rf %{buildroot} %post -n libgstrtspserver-0_10-0 -p /sbin/ldconfig %postun -n libgstrtspserver-0_10-0 -p /sbin/ldconfig %files -n libgstrtspserver-0_10-0 %defattr(-, root, root) %doc AUTHORS COPYING README docs/design/gst-rtp-server-design %{_libdir}/libgstrtspserver-0.10.so.* %files -n libgstrtspserver-0_10-devel %defattr(-, root, root) %{_includedir}/gstreamer-0.10/gst/rtsp-server %{_libdir}/libgstrtspserver-0.10.so %{_libdir}/pkgconfig/gst-rtsp-server-0.10.pc %dir %{_datadir}/gst-rtsp/ %dir %{_datadir}/gst-rtsp/0.10/ # defs for python bindings %{_datadir}/gst-rtsp/0.10/defs/ %{_datadir}/vala/vapi/gst-rtsp-server-0.10.* %files -n python-gstreamer-0_10-plugin-rtspserver %defattr(-, root, root) %{python_sitearch}/gst-0.10/gst/rtspserver.so %changelog ++++++ gst-rtsp-fix-vala-detection.patch ++++++ Index: gst-rtsp-0.10.5/configure.ac =================================================================== --- gst-rtsp-0.10.5.orig/configure.ac +++ gst-rtsp-0.10.5/configure.ac @@ -118,7 +118,12 @@ fi AM_CONDITIONAL(WITH_PYTHON, [test "x$HAVE_PYTHON_BINDINGS" = "xyes"]) dnl Check for vala -PKG_CHECK_EXISTS([vala-1.0], [HAVE_VALA="yes"], [HAVE_VALA="no"]) +AM_PROG_VALAC() +if test "x$VALAC" != "x"; then + HAVE_VALA="yes" +else + HAVE_VALA="no" +fi AM_CONDITIONAL(WITH_VALA, [test "x$HAVE_VALA" = "xyes"]) @@ -127,7 +132,7 @@ AC_ARG_WITH([vapidir], if test "x$HAVE_VALA" = "xyes"; then if test "x$with_vapidir" = "x"; then - VAPIDIR="`pkg-config --variable vapidir vala-1.0`" + VAPIDIR="${datadir}/vala/vapi" else VAPIDIR="$with_vapidir" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cronie for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at Mon Sep 27 17:40:08 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/cronie/cronie.changes 2010-08-26 03:40:00.000000000 +0200 @@ -0,0 +1,870 @@ +------------------------------------------------------------------- +Thu Aug 26 01:34:34 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update to cronie 1.4.5 +- drop upstreamed patches in particular minuslog and pam_conv. +- cronie can work without sendmail now, if absent syslog is used. + +------------------------------------------------------------------- +Wed Apr 7 18:50:23 UTC 2010 - mseben(a)novell.com + +- added crond_pid.diff to finaly fix cron.pid issue which breaks + init script + +------------------------------------------------------------------- +Thu Mar 25 14:28:30 UTC 2010 - mseben(a)novell.com + +- updated to version 1.4.4 + * src/crontab.c: CVE-2010-0424 -- crontab -e crontab file timestamp + race condition + * configure.ac: Dynamic shared libraries -laudit There is need to + add -laudit into gcc options because now it's no found automatically. + * man/anacrontab.5: Make man page more readable based on #564206. + * crond.sysconfig, cronie.init: CRON_VALIDATE_MAILRCPTS was removed, + because it was not used anyway. + * src/do_command.c, src/funcs.h, src/security.c: With NFS homes + can't be job executed, because root can't access this directory. + * man/cron.8, src/do_command.c: Disable mailing output. + * man/cron.8, src/cron.c, src/do_command.c, src/globals.h: Output + could be redirectered to syslog. + * src/security.c: Cron doesn't use environment values from + /etc/security/pam_env.conf. This was fixed by moving pam_setcred + into first part of authentication of pam. + * cronie.init: Initscript: if unprivileged user stop deamon, it + should return 4. + * cronie.init: Initscript: if unprivileged user restart deamon, it + should return 4. + * src/security.c: This function will be probably removed from + libselinux, so it is added into source code here. + * pam/crond: One line was missing in pam authentication. rhbz#533189 + * Makefile.am, configure.ac: Autotools - Makefile includes + dailyjobs, configure has new version. + +------------------------------------------------------------------- +Fri Feb 19 13:58:34 UTC 2010 - mseben(a)novell.com + +- added race-mtime_new.patch : to fix crontab -e crontab file + timestamp race condition (bnc#580800) (CVE-2010-0424) + +------------------------------------------------------------------- +Wed Feb 3 22:03:53 UTC 2010 - mseben(a)novell.com + +- added nheader_lines.diff : ignore top three lines of comments in + crontab file when user use crontab -e +- added $RPM_OPT_FLAGS to build stage + +------------------------------------------------------------------- +Sat Dec 19 18:13:04 CET 2009 - jengelh(a)medozas.de + +- enable parallel build + +------------------------------------------------------------------- +Thu Dec 17 07:28:54 UTC 2009 - mseben(a)novell.com + +- added subpackage cronie-anacron + +------------------------------------------------------------------- +Wed Dec 9 12:24:49 UTC 2009 - mseben(a)novell.com + +- added pam_conv.diff to add pam conversationfrom function +- added pam_config.diff to add pam config file from old cron +- added Provides: cron = 4.2, Obsoletes: cron <= 4.1 +- added SPOOL_DIR="/var/spool/cron/tabs" to build section to correct + tabs dir for users + +------------------------------------------------------------------- +Tue Dec 8 17:03:14 UTC 2009 - mseben(a)novell.com + +- added minuslog.diff and remove_old_system.diff + from cron package + +------------------------------------------------------------------- +Mon Dec 7 22:49:49 UTC 2009 - crrodriguez(a)opensuse.org + +- enable anacron build +- enable audit support +- cleanup spec file a bit + +------------------------------------------------------------------- +Sat Dec 5 21:36:57 UTC 2009 - mseben(a)novell.com + +- switch to cronie 1.4.3, see project page : + https://fedorahosted.org/cronie/ +- anacron and audit support disabled for now +- /usr/sbin/cron renamed to /usr/sbin/crond + +------------------------------------------------------------------- +Fri Nov 27 10:08:49 UTC 2009 - mseben(a)novell.com + +- added initgroups_check.patch : verify return value of + initgroups (bnc#537178) (CVE-2006-2607) + +------------------------------------------------------------------- +Wed Nov 18 17:18:44 UTC 2009 - mseben(a)novell.com + +- added pam conversion function (reworked pam.diff) fate#306386 + +------------------------------------------------------------------- +Wed Nov 18 14:39:49 UTC 2009 - mseben(a)novell.com + +- modified run-crons script : added support for new SEND_OUTPUT_ON_NO_ERROR + sysconfig option to block status mails from cron jobs with empty + output (fate#305279) + +------------------------------------------------------------------- +Tue Nov 3 19:09:11 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Wed Oct 14 18:28:22 CEST 2009 - ro(a)suse.de + +- init script: remove "-p $PIDFILE" from startproc call + (until startproc does allow to combine -f and -p again) + +------------------------------------------------------------------- +Fri Aug 22 16:42:20 CEST 2008 - prusnak(a)suse.cz + +- added -DWITH_SELINUX to DEFS + +------------------------------------------------------------------- +Thu Aug 21 01:52:40 CEST 2008 - ro(a)suse.de + +- remove outdated options from fillup_and_insserv call + +------------------------------------------------------------------- +Wed Aug 20 15:20:06 CEST 2008 - mkoenig(a)suse.de + +- enable SELinux support [fate#303662] + +------------------------------------------------------------------- +Wed Aug 13 15:25:44 CEST 2008 - mkoenig(a)suse.de + +- fix init script tags + +------------------------------------------------------------------- +Wed Jan 16 10:46:36 CET 2008 - mskibbe(a)suse.de + +- Fate #301837: CRON XLM Service Description Document + +------------------------------------------------------------------- +Tue Jan 8 13:16:38 CET 2008 - coolo(a)suse.de + +- let cron recommend postfix, so that the package solver knows + that one of the smtp_daemons is preferred by the distribution + in case the user has no further input on this (#351027) + +------------------------------------------------------------------- +Wed Dec 12 10:56:51 CET 2007 - mkoenig(a)suse.de + +- remove old *system* entries before database reload to avoid + comparing wrong mtimes. [#344667] + +------------------------------------------------------------------- +Mon Dec 10 13:19:01 CET 2007 - mkoenig(a)suse.de + +- prevent cron.monthly running twice in a month [#338474] + +------------------------------------------------------------------- +Wed Dec 5 15:47:53 CET 2007 - mkoenig(a)suse.de + +- revert last change, it was wrong [#346150] + +------------------------------------------------------------------- +Wed Nov 28 12:10:12 CET 2007 - mkoenig(a)suse.de + +- fix calculation of time difference in run-crons script + +------------------------------------------------------------------- +Tue Nov 27 17:03:55 CET 2007 - mkoenig(a)suse.de + +- fix problem with DAILY_TIME set to 00:00 + +------------------------------------------------------------------- +Wed Nov 7 10:57:07 CET 2007 - mkoenig(a)suse.de + +- add %fillup_prereq and %insserv_prereq to Prereq + +------------------------------------------------------------------- +Tue Oct 16 14:17:35 CEST 2007 - mkoenig(a)suse.de + +- move ac power test to the beginning of the run_crons script, + to avoid creation of the tmpdir [#333751] + +------------------------------------------------------------------- +Tue Jun 19 18:48:21 CEST 2007 - dmueller(a)suse.de + +- cron should depend on smtp ++++ 673 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/cronie/cronie.changes calling whatdependson for head-i586 New: ---- cron.init cron.xml cronie-1.4.5_git201007091204.tar.bz2 cronie-crond_pid.diff cronie-nheader_lines.diff cronie-pam_config.diff cronie-rpmlintrc cronie.changes cronie.spec cronie.xml deny.sample run-crons sample.root ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ # # spec file for package cronie (Version 1.4.5_git201007091204) # # 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: cronie BuildRequires: audit-devel libselinux-devel pam-devel Url: https://fedorahosted.org/cronie/ License: MIT and BSD and GPLv2 Group: System/Daemons Requires: smtp_daemon Recommends: postfix AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq Version: 1.4.5_git201007091204 Release: 1 Summary: Cron Daemon Source0: %name-%version.tar.bz2 Source1: cron.init Source2: run-crons Source3: sample.root Source4: deny.sample Source5: cron.xml Source6: cronie-rpmlintrc # PATCH-FEATURE-OPENSUSE cronie-pam_config.diff added pam config file from old cron Patch3: %name-pam_config.diff # openSUSE set NHEADER_LINES to 3 - old openSUSE cron put three lines of comments # in top of crontab file, so we want to hide this junk comments if user edit # crontab file with crontab -e command, patch grabbed from old openSUSE cron Patch4: %name-nheader_lines.diff # we use cron.pid instead of crond.pid Patch5: %name-crond_pid.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: cron = 4.2 Obsoletes: cron <= 4.1 %description cron automatically starts programs at specific times. Add new entries with "crontab -e". (See "man 5 crontab" and "man 1 crontab" for documentation.) Under /etc, find the directories cron.hourly, cron.daily, cron.weekly, and cron.monthly. Scripts and programs that are located there are started automatically. %package anacron License: MIT and BSD and GPLv2 Summary: Utility for running regular jobs Group: System Environment/Base Requires: %{name} = %{version} %description anacron Anacron becames part of cronie. Anacron is used only for running regular jobs. The default settings execute regular jobs by anacron, however this could be overloaded in settings. %prep %setup -q %patch3 -p1 %patch4 -p1 %patch5 -p1 %build autoreconf -fiv # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\"" %configure --with-audit --enable-anacron --with-pam --with-selinux --with-inotify --enable-pie SPOOL_DIR="/var/spool/cron/tabs" %{__make} %{?jobs:-j%jobs} %install %makeinstall %{__mkdir_p} -v %{buildroot}%{_localstatedir}/spool/cron/{tabs,lastrun} %{__mkdir_p} -v %{buildroot}%{_sysconfdir}/cron.{d,hourly,daily,weekly,monthly} %{__install} -v -m 600 %{SOURCE3} %{buildroot}/etc/crontab %{__install} -v -m 600 %{SOURCE4} %{buildroot}/etc/cron.deny %{__install} -v -d %{buildroot}/usr/lib/cron %{__install} -v %{SOURCE2} %{buildroot}/usr/lib/cron %{__install} -v -d %{buildroot}%{_sysconfdir}/init.d/ %{__install} -v -m744 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/cron %{__ln_s} -f ../../etc/init.d/cron %{buildroot}/usr/sbin/rccron %{__install} -m 644 contrib/anacrontab $RPM_BUILD_ROOT%{_sysconfdir}/anacrontab %{__install} -c -m755 contrib/0anacron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/0anacron %{__mkdir_p} $RPM_BUILD_ROOT/var/spool/anacron %{__mv} %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron touch $RPM_BUILD_ROOT/var/spool/anacron/cron.daily touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly # service xml %{__install} -v -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %{__install} -v -m644 %{S:5} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %post %{fillup_and_insserv -y cron} %run_permissions %verifyscript %verify_permissions -e /etc/crontab -e /usr/bin/crontab %preun %stop_on_removal cron %postun %restart_on_update cron %{insserv_cleanup} %post anacron [ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily [ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly [ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly %files %defattr(-,root,root) %doc AUTHORS COPYING INSTALL README ChangeLog %dir %attr(700,root,root) /var/spool/cron %dir %attr(700,root,root) /var/spool/cron/tabs %dir /var/spool/cron/lastrun %config /etc/init.d/cron %config /etc/pam.d/crond %verify(not mode) %config(noreplace) /etc/crontab %config(noreplace) /etc/cron.deny %{_mandir}/man1/crontab.1.gz %{_mandir}/man5/crontab.5.gz %{_mandir}/man8/cron.8.gz %{_mandir}/man8/crond.8.gz %verify(not mode) %attr (4750,root,trusted) /usr/bin/crontab %attr (755,root,root) %{_sbindir}/cron %{_sbindir}/rccron /usr/lib/cron %config %{_sysconfdir}/omc/srvinfo.d/cron.xml %dir %{_sysconfdir}/omc/srvinfo.d/ %dir %{_sysconfdir}/omc/ %files anacron %defattr(-,root,root,-) %{_sbindir}/anacron %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron %config(noreplace) %{_sysconfdir}/anacrontab %dir /var/spool/anacron %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.monthly %{_mandir}/man5/anacrontab.* %{_mandir}/man8/anacron.* %changelog ++++++ cron.init ++++++ #! /bin/sh # Copyright (c) 1995-2000 SuSE GmbH Nuernberg, Germany. # # Author: Werner Fink <werner(a)suse.de>, 1996-2001 # # /etc/init.d/cron # # and symbolic its link # # /usr/sbin/rccron # # System startup script for the cron daemon # ### BEGIN INIT INFO # Provides: cron # Required-Start: $remote_fs $syslog $time # Should-Start: $network smtp # Required-Stop: $remote_fs $syslog # Should-Stop: $network smtp # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Cron job service # Description: Cron job service ### END INIT INFO CRON_BIN=/usr/sbin/cron test -x $CRON_BIN || exit 5 PIDFILE=/var/run/cron.pid # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. allow_deny_move_info() { echo "WARNING: /var/spool/cron/allow and /var/spool/cron/deny have moved" echo "to /etc/cron.allow and /etc/cron.deny." echo "Please merge or move these files to get cron access rules restored." } case "$1" in start) for al_de in {allow,deny}{,.rpmsave,.rpmorig} ; do if [ -f /var/spool/cron/$al_de ] ; then allow_deny_move_info break fi done echo -n "Starting CRON daemon" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. # NOTE: startproc return 0, even if service is # already running to match LSB spec. startproc -p $PIDFILE $CRON_BIN #startproc -f $CRON_BIN # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down CRON daemon" ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. killproc -TERM -p $PIDFILE $CRON_BIN # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service Cron" ## if it supports it: ## cron monitors /etc/crontab anyway checkproc $CRON_BIN rc_status -v ## Otherwise: #$0 stop && $0 start #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signalling, do nothing (!) ## Otherwise if it does not support reload: rc_status -v ;; status) echo -n "Checking for Cron: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. checkproc $CRON_BIN rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, ## give out the argument which is required for a reload. ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ cronie-crond_pid.diff ++++++ Index: cronie-1.4.4/src/pathnames.h =================================================================== --- cronie-1.4.4.orig/src/pathnames.h +++ cronie-1.4.4/src/pathnames.h @@ -41,7 +41,7 @@ #else # define PIDDIR SYSCONFDIR "/" #endif -#define PIDFILE "crond.pid" +#define PIDFILE "cron.pid" #define _PATH_CRON_PID PIDDIR PIDFILE #define REBOOT_LOCK PIDDIR "cron.reboot" ++++++ cronie-nheader_lines.diff ++++++ Index: cronie-1.4.3/src/crontab.c =================================================================== --- cronie-1.4.3.orig/src/crontab.c +++ cronie-1.4.3/src/crontab.c @@ -33,7 +33,7 @@ # include <selinux/av_permissions.h> #endif -#define NHEADER_LINES 0 +#define NHEADER_LINES 3 enum opt_t {opt_unknown, opt_list, opt_delete, opt_edit, opt_replace}; @@ -347,7 +347,7 @@ static char *tmp_path() { static void edit_cmd(void) { char n[MAX_FNAME], q[MAX_TEMPSTR], *editor; FILE *f; - int ch = '\0', t; + int ch = '\0', t, x; struct stat statbuf; struct utimbuf utimebuf; WAIT_T waiter; @@ -399,13 +399,25 @@ static void edit_cmd(void) { } Set_LineNum(1) - /* - * NHEADER_LINES processing removed for clarity - * (NHEADER_LINES == 0 in all Red Hat crontabs) - */ - /* copy the rest of the crontab (if any) to the temp file. - */ - if (EOF != ch) + + /* ignore the top few comments since we probably put them there. + */ + x = 0; + while (EOF != (ch = get_char(f))) { + if ('#' != ch) { + putc(ch, NewCrontab); + break; + } + while (EOF != (ch = get_char(f))) + if (ch == '\n') + break; + if (++x >= NHEADER_LINES) + break; + } + + /* copy the rest of the crontab (if any) to the temp file. + */ + if (EOF != ch) while (EOF != (ch = get_char(f))) putc(ch, NewCrontab); @@ -605,6 +617,7 @@ static int replace_cmd(void) { int error = 0; entry *e; uid_t file_owner; + time_t now = time(NULL); char **envp = env_init(); if (envp == NULL) { @@ -636,10 +649,10 @@ static int replace_cmd(void) { * * VERY IMPORTANT: make sure NHEADER_LINES agrees with this code. */ - /*fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); - *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); - *fprintf(tmp, "# (Cron version %s)\n", CRON_VERSION); - */ + fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); + fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); + fprintf(tmp, "# (Cronie version %s)\n", CRON_VERSION); + #ifdef WITH_SELINUX if (selinux_context) fprintf(tmp, "SELINUX_ROLE_TYPE=%s\n", selinux_context); ++++++ cronie-pam_config.diff ++++++ w Index: cronie-1.4.4/pam/crond =================================================================== --- cronie-1.4.4.orig/pam/crond +++ cronie-1.4.4/pam/crond @@ -3,8 +3,9 @@ # # # No PAM authentication called, auth modules not needed -account required pam_access.so -account include password-auth -session required pam_loginuid.so -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so +auth include common-auth +account include common-account +password include common-password +session required pam_loginuid.so +session include common-session ++++++ cronie-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter("cronie.* incoherent-init-script-name")++++++ deny.sample ++++++ guest ++++++ run-crons ++++++ #!/bin/bash # # /usr/lib/cron/run-crons # # Copyright (c) 1998-2001 SuSE GmbH Nuernberg, Germany. All rights reserved. # # this script looks into /etc/cron.{hourly,daily,weekly,monthly} for # scripts to be executed. The info about last run is stored in # /var/spool/cron/lastrun # # concept similar to debian and redhat # # Changes: # 1998 - Burchard Steinbild <bs(a)suse.de>, 1998 # initial version # before 2001 - va(a)org.chemie.uni-frankfurt.de # send an email with name of date-script instead of cron entry # "Subject: cronjob@www - daily - FAILURE" # (better one script for each date-sub-script) # requires changes to /etc/crontab # append > /dev/null 2>&1 to the line calling run-cons # 2001-09-11 # updated to Suse 7.2 merged # 2001-09-12 # changed FAILURE detection, until now all scripts with output # had "failed", now only scripts with error status != 0 # have failed. # 2001-09-13 - ro(a)suse.de # merged with 7.3: call logger with exit value for scripts # respect MAILTO as cron does # use mktemp -d for all tmpfiles # add variable to disable mail if all jobs returned 0 # # # Don't run jobs on laptops, that are AC-offline # if test -x /usr/bin/on_ac_power ; then on_ac_power -q if [ "$?" = "1" ]; then exit 0 fi fi if [ -f /etc/sysconfig/cron ]; then . /etc/sysconfig/cron fi BASENAME=`/usr/bin/basename $0` LOGGER="/bin/logger -t $BASENAME[$$]" export LC_TIME=POSIX TMPDIR=`mktemp -d /tmp/run-crons.XXXXXX` trap "rm -rf $TMPDIR" 0 1 2 3 13 15 # We will force to run cron.daily after 14 days, even # if you set MAX_NOT_RUN in /etc/sysconfig/cron # value is in minutes MAX_NOT_RUN_FORCE="20160" # Priority change for sub scripts. # range: highest -20 ... 19 lowest prioriy # default processes start in level 10 CRON_SCRIPT_NICE_VALUE=15 SPOOL=/var/spool/cron/lastrun # CRON Result EMail is sent to if test -z "$MAILTO" ; then SEND_TO="root" else SEND_TO="$MAILTO" fi mkdir -p $SPOOL #set verbose ## stage 1, search directories/scripts to run RUN="" for CRONDIR in /etc/cron.{hourly,daily,weekly,monthly} ; do test -d $CRONDIR || continue BASE=${CRONDIR##*/} TIME_EXT=${BASE##cron.} test -e $SPOOL/$BASE && { case $BASE in cron.hourly) TIME="-cmin +60 -or -cmin 60" ;; cron.daily) # if DAILY_TIME set, run only at a fixed time of day if [ "$DAILY_TIME" != "" ] ; then DAILY_TIME_NEW="`echo $DAILY_TIME | sed s,:,, | sed s,^0\*,, `" test -z "$DAILY_TIME_NEW" && DAILY_TIME_NEW=0 if [ "$DAILY_TIME_NEW" -gt "2359" ] ; then echo "wrong time format in /etc/sysconfig/cron DAILY_TIME, value is $DAILY_TIME" | logger fi NOW_H=`date +%H%M| sed s,^0\*,,` test -z "$NOW_H" && NOW_H=0 if [ $DAILY_TIME_NEW -gt $(($NOW_H-15)) ] && [ $DAILY_TIME_NEW -le $NOW_H ]; then TIME="" else # take care of MAX_NOT_RUN, default is 7 days if [ "$MAX_NOT_RUN" != "0" ] ; then TIME="-cmin +$((1440*$MAX_NOT_RUN)) -or -cmin $((1440*$MAX_NOT_RUN))" else TIME="-cmin +$MAX_NOT_RUN_FORCE -or -cmin $MAX_NOT_RUN_FORCE" fi fi # run as usual else TIME="-cmin +1440 -or -cmin 1440" fi ;; cron.weekly) TIME="-cmin +10080 -or -cmin 10080" ;; cron.monthly) DAYOFMONTH=`date '+%d'` DAYSLASTMONTH=`date -d "-$DAYOFMONTH days" '+%d'` if [ $DAYOFMONTH -gt $DAYSLASTMONTH ] ; then LASTMONTHSTR="-$DAYOFMONTH days" else LASTMONTHSTR="last month" fi NOW=`date +%s` LASTMONTH=`date -d "$LASTMONTHSTR" +%s` DIFF=`expr '(' $NOW - $LASTMONTH ')' / 86400` TIME="-ctime +$DIFF" ;; esac # remove all lock files for scripts that are due to run eval find $SPOOL/$BASE $TIME | \ xargs --no-run-if-empty rm } if test ! -e $SPOOL/$BASE ; then # accept this dir, if it isn't empty LIST=`find $CRONDIR ! -type d` if [ ! -z "$LIST" ] ; then RUN="${RUN} ${TIME_EXT}" fi fi done ## STATUS communication variable between # function run_scripts () # and loop-over-all-scripts # set in run_scripts to FAILURE if this script failed! # else it is empty # because it is never reset to empty after the initialization # it implements an OR like logic over all scripts ## STATUS="" # helper, run all scripts in one cron directory function run_scripts (){ local CRONDIR=$1 local TIME_EXT=$2 local TEMP_MSG=$TMPDIR/run-crons.${TIME_EXT}.$$ rm -r $TMPDIR/run-crons.${TIME_EXT}.* >/dev/null 2>&1 # keep going when something fails set +e for SCRIPT in $CRONDIR/* ; do test -d $SCRIPT && continue case "$SCRIPT" in .svn) continue ;; *.rpm*) continue ;; *.swap) continue ;; *.bak) continue ;; *.orig) continue ;; \#*) continue ;; *~) continue ;; esac /sbin/checkproc $SCRIPT && continue if test -x $SCRIPT ; then BASESCRIPT=`/usr/bin/basename $SCRIPT` nice -n ${CRON_SCRIPT_NICE_VALUE} $SCRIPT >$TEMP_MSG 2>&1 local ERRNO=$? if [ 0 -eq $ERRNO ] ; then if [ "$SYSLOG_ON_NO_ERROR" = "yes" ]; then echo "$BASESCRIPT: OK" | $LOGGER -p info fi else echo "$BASESCRIPT returned $ERRNO" | $LOGGER -p warn echo "SCRIPT: $BASESCRIPT exited with RETURNCODE = $ERRNO." STATUS="FAILURE" fi # write some wrapper text around the original output if [ -s "$TEMP_MSG" ] ; then echo "SCRIPT: output (stdout && stderr) follows" echo "" cat $TEMP_MSG echo -e "SCRIPT: $BASESCRIPT\n------- END OF OUTPUT" echo "" echo "" fi rm -f $TEMP_MSG > /dev/null 2>&1 else echo "WARNING: $SCRIPT is not executable, script is ignored !" fi done } # stage 2: # run all scripts and collect output into one mail # for each TIME_EXT with a meaningfull subject. # if [ ! -z "${RUN}" ] ; then for EXT in ${RUN} ; do CRONDIR="/etc/cron."${EXT} test -d $CRONDIR || continue BASE=`/usr/bin/basename $CRONDIR` TIME_EXT=${BASE##cron.} STATUS="" if test ! -e $SPOOL/$BASE ; then CONTROL_MAIL=$TMPDIR/run-crons_mail.$$ JOB_OUTPUT=$TMPDIR/run-crons_output.$$ echo "running ${TIME_EXT} cronjob scripts" >> ${CONTROL_MAIL} echo "" >> ${CONTROL_MAIL} touch $SPOOL/$BASE run_scripts ${CRONDIR} ${TIME_EXT} >> ${JOB_OUTPUT} 2>&1 TITLE="cronjob@$HOSTNAME - ${TIME_EXT}" if [ -n "${STATUS}" ] ; then TITLE="${TITLE} - ${STATUS}" else TITLE="${TITLE} - OK" fi if [ -n "${STATUS}" -o "$SEND_MAIL_ON_NO_ERROR" = "yes" ] ; then cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" elif [ -s ${JOB_OUTPUT} -a "$SEND_OUTPUT_ON_NO_ERROR" = "yes" ] ; then cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" fi rm -f ${CONTROL_MAIL} ${JOB_OUTPUT} fi done fi # # now make sure, we have no lastrun files dated to future # touch $SPOOL NOW=`date -u +%s` for i in `find $SPOOL -type f` do FILEDATE=`date -u -r $i +%s` # allow for up to one hour in the future because of summer/wintertime if [ $((FILEDATE - NOW)) -gt 3600 ] then rm $i fi done ++++++ sample.root ++++++ SHELL=/bin/sh PATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin MAILTO=root # # check scripts in cron.hourly, cron.daily, cron.weekly, and cron.monthly # -*/15 * * * * root test -x /usr/lib/cron/run-crons && /usr/lib/cron/run-crons >/dev/null 2>&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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Mon Sep 27 17:39:09 CEST 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-09-26 15:44:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2010-09-27 13:43:17.000000000 +0200 @@ -2 +2 @@ -Sun Sep 26 15:44:28 CEST 2010 - autobuild(a)suse.de +Mon Sep 27 13:43:16 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-26 +- automated update on 2010-09-27 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.8vsFUK/_old 2010-09-27 17:39:04.000000000 +0200 +++ /var/tmp/diff_new_pack.8vsFUK/_new 2010-09-27 17:39:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.9.26) +# spec file for package rfc (Version 2010.9.27) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.9.26 +Version: 2010.9.27 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, 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 opensuse-manuals_de for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package opensuse-manuals_de for openSUSE:Factory checked in at Mon Sep 27 17:38:51 CEST 2010. -------- --- opensuse-manuals_de/opensuse-manuals_de.changes 2009-11-09 13:13:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-manuals_de.changes 2010-09-22 14:52:20.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 22 14:45:30 CEST 2010 - ke(a)suse.de + +- Add more Provides/Obsoletes: opensuse-apparmor-admin_de-pdf, + opensuse-kdeuser_de-pdf, opensuse-gnomeuser_de-pdf, + opensuse-apps_de-pdf, opensuse-security_de-pdf. + +------------------------------------------------------------------- +Tue Sep 21 14:10:06 CEST 2010 - ke(a)suse.de + +- Update text and image files; bnc#639823. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- LICENSE.txt opensuse-gnomequick-LICENSE.txt opensuse-installquick-LICENSE.txt opensuse-kdequick-LICENSE.txt opensuse-reference-LICENSE.txt opensuse-startup-LICENSE.txt pre_checkin.sh update_spec.pl New: ---- doc_pre_checkin.sh opensuse-gnomequick_de-pdf-yelp.tar.bz2 opensuse-installquick_de-pdf-yelp.tar.bz2 opensuse-kdequick_de-pdf-yelp.tar.bz2 opensuse-reference_de-pdf-yelp.tar.bz2 opensuse-startup_de-pdf-yelp.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_de.spec ++++++ --- /var/tmp/diff_new_pack.6b2Vhi/_old 2010-09-27 17:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6b2Vhi/_new 2010-09-27 17:38:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package opensuse-manuals_de (Version 11.2) +# spec file for package opensuse-manuals_de (Version 11.3) # -# Copyright (c) 2009 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,17 +20,26 @@ Name: opensuse-manuals_de %define my_lang de -%define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang} %define my_book opensuse-html -Version: 11.2 -Release: 2 -Obsoletes: %{my_prov_obs} -Provides: %{my_prov_obs} +Version: 11.3 +Release: 1 Provides: locale(desktop-data-openSUSE:de) -Obsoletes: opensuse-manual_de opensuse-quickstart_de opensuse-kdequick_de opensuse-gnomequick_de opensuse-gnomeuser_de opensuse-kdeuser_de opensuse-kde3user_de apparmor-admin_de -Provides: opensuse-manual_de opensuse-quickstart_de opensuse-kdequick_de opensuse-gnomequick_de opensuse-gnomeuser_de opensuse-kdeuser_de opensuse-kde3user_de apparmor-admin_de +Obsoletes: opensuse-manual_de < 11.2 opensuse-kdequick_de < 11.1 opensuse-gnomequick_de < 11.1 opensuse-gnomeuser_de < 11.1 opensuse-kdeuser_de < 11. opensuse-kde3user_de < 11.1 apparmor-admin_de < 11.1 +Provides: opensuse-manual_de = %{version}-%{release} opensuse-kdequick_de = %{version}-%{release} opensuse-gnomequick_de = %{version}-%{release} opensuse-gnomeuser_de = %{version}-%{release} opensuse-kdeuser_de = %{version}-%{release} opensuse-kde3user_de = %{version}-%{release} apparmor-admin_de = %{version}-%{release} +Obsoletes: opensuse-manual_de-pdf < 11.2 opensuse-kde3user_de-pdf < 11.1 opensuse-manuals_de-pdf < 11.3 +Provides: opensuse-manual_de-pdf = %{version}-%{release} opensuse-kde3user_de-pdf = %{version}-%{release} opensuse-manuals_de-pdf = %{version}-%{release} +Obsoletes: opensuse-apparmor-admin_de-pdf < 11.2 +Obsoletes: opensuse-apps_de-pdf < 11.3 +Obsoletes: opensuse-gnomeuser_de-pdf < 11.3 +Obsoletes: opensuse-kdeuser_de-pdf < 11.3 +Obsoletes: opensuse-security_de-pdf < 11.3 +Provides: opensuse-apparmor-admin_de-pdf = %{version}-%{release} +Provides: opensuse-apps_de-pdf = %{version}-%{release} +Provides: opensuse-gnomeuser_de-pdf = %{version}-%{release} +Provides: opensuse-kdeuser_de-pdf = %{version}-%{release} +Provides: opensuse-security_de-pdf = %{version}-%{release} + #OBS -Source09: LICENSE.txt Source00: opensuse-html_de-html.tar.bz2 Source01: opensuse-html_de-desktop.tar.bz2 Source02: opensuse-html_de-graphics.tar.bz2 @@ -38,112 +47,130 @@ Source10: opensuse-installquick_de.pdf #Source11: opensuse-installquick_de-graphics.tar.bz2 #Source12: opensuse-installquick_de.tar.bz2 -Source13: opensuse-installquick-LICENSE.txt +Source13: opensuse-installquick_de-pdf-yelp.tar.bz2 Source20: opensuse-gnomequick_de.pdf #Source21: opensuse-gnomequick_de-graphics.tar.bz2 #Source22: opensuse-gnomequick_de.tar.bz2 -Source23: opensuse-gnomequick-LICENSE.txt +Source23: opensuse-gnomequick_de-pdf-yelp.tar.bz2 Source30: opensuse-kdequick_de.pdf #Source31: opensuse-kdequick_de-graphics.tar.bz2 #Source32: opensuse-kdequick_de.tar.bz2 -Source33: opensuse-kdequick-LICENSE.txt +Source33: opensuse-kdequick_de-pdf-yelp.tar.bz2 Source40: opensuse-reference_de.pdf #Source41: opensuse-reference_de-graphics.tar.bz2 #Source42: opensuse-reference_de.tar.bz2 -Source43: opensuse-reference-LICENSE.txt +Source43: opensuse-reference_de-pdf-yelp.tar.bz2 Source50: opensuse-startup_de.pdf #Source51: opensuse-startup_de-graphics.tar.bz2 #Source52: opensuse-startup_de.tar.bz2 -Source53: opensuse-startup-LICENSE.txt +Source53: opensuse-startup_de-pdf-yelp.tar.bz2 #SOURCES -Source901: pre_checkin.sh -Source902: update_spec.pl +Source901: doc_pre_checkin.sh Source903: attributes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: update-desktop-files Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) +License: GFDLv1.2 +Summary: Complete set of openSUSE Manuals (HTML, German) %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual -%define PDFDOC %{_defaultdocdir}/%{name}-pdf %description -The openSUSE manual package contains the Start-Up, Reference, AppArmor -Quick Start (English) , AppArmor Administration Guide (English), GNOME -and KDE Quick Start, GNOME and KDE User Guide (English), and the -Application Guide (English). +Contains the complete official openSUSE documentation in HTML +format. It can be accessed via the Desktop's help centers. +The following manuals are included: + +* Installation Quick Start + +* Start-Up + +* GNOME Quick Start + +* GNOME User Guide (English) + +* KDE Quick Start + +* KDE User Guide (English) + +* Application Guide (English) + +* Reference + +* Security Guide (English) + +* AppArmor Quick Start (English) %package -n opensuse-installquick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Install Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Installation Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-installquick_de-pdf -PDF of the openSUSE Install Quickstart (German). +A quick start guide providing a walk-through to the default installation. %package -n opensuse-gnomequick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE GNOME Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: GNOME Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-gnomequick_de-pdf -PDF of the openSUSE GNOME Quickstart (German). +A quick start guide to the GNOME desktop. %package -n opensuse-kdequick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE KDE Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: KDE Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-kdequick_de-pdf -PDF of the openSUSE KDE Quickstart (German). +A quick start guide to the KDE desktop. %package -n opensuse-reference_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Reference (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-reference_de-pdf -PDF of the openSUSE Manual (German). +This guide gives you a general understanding of your system and +covers advanced system administration tasks. It is intended +mainly for system administrators and home users with basic system +administration knowledge. It provides detailed information about +advanced deployment scenarios, administration of your system, +the interaction of key system components and the set-up of +various network and file services. %package -n opensuse-startup_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Start-Up (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-startup_de-pdf -PDF of the openSUSE Manual (German). - -%package pdf -Group: Documentation/SuSE -License: GFDL -Summary: SUSE LINUX Adminguide (english) -Provides: locale(desktop-data-openSUSE:de) -Obsoletes: opensuse-manual_de-pdf opensuse-quickstart_de-pdf opensuse-kde3user_de-pdf -Provides: opensuse-manual_de-pdf opensuse-quickstart_de-pdf opensuse-kde3user_de-pdf -#PDFOBS - -%description pdf -- +Guides you through the installation and basic configuration of your +system. For newcomers, the manual also introduces basic Linux concepts +such as the file system, the user concept and access permissions and +gives an overview of the features the system offers to support +mobile computing. Provides help and advice in troubleshooting. %prep #%setup -c -q %setup -c -q -a 01 -echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf +#echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf #PREP -cp %{S:9} . find -name '*.png' -o -name '*.svg' | xargs chmod 644 || : +tar xvf %{S:13} +tar xvf %{S:23} +tar xvf %{S:33} +tar xvf %{S:43} +tar xvf %{S:53} #PDFPREP %build @@ -157,17 +184,15 @@ %install mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} # is set for sles or sled as /sles or /sled -%define my_desktopdir /usr/share/susehelp/meta -echo %{my_desktopdir} | sed 's:$\|xyzy$::' >filelist # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### -install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} # product is name without language code %define gnome_dir %{_datadir}/gnome/help/opensuse-manuals install -d $RPM_BUILD_ROOT%{gnome_dir} # if [ -d html/%my_book ]; then mv html/%my_book html/manual +### handle desktop files pushd desktop # problem writing desktop files on 10.3 ### CHECKIT: still necessary on 11.0? @@ -188,17 +213,6 @@ rmdir $dir fi fi -for f in $(find . -type f -name '*desktop'); do - # /usr/share/doc/manual/suselinux-manual_en/manual - sed -i "/^X-DOC-Identifier.*/d -s|@PATH@|%{_defaultdocdir}/%{name}/manual| -s/\[\]//" $f - if ! grep -q -e '^Name *=' $f; then - # requiered if no "Name=" is present - sed -i "s|^Name\[.*\]$=.*$|Name\1\\ -&|" $f - fi -done for d in $(find . -maxdepth 1 -type d -name 'book*'); do id=${d//\./} id=${id//\//}%{my_lang} @@ -215,6 +229,8 @@ done popd done +### remove it, only keep yelp and kde4 -- they depend on top-level +### .directory files... # Probably useful for stand-alone books for f in $(find . -name '*.directory'); do id=%{name} @@ -226,6 +242,7 @@ if [ $f = ./.directory ]; then sed -i 's:$^DocPath.*/$.*:\1index.html: s/^$Name\|Comment$$.*$/\1\2 (%{my_lang})/' $f + # write yelp / rarian file sed " # remove useless comments and search settings @@ -241,10 +258,12 @@ s/^X-DOC-Identifier=/DocIdentifier=com.novell./ s/^X-DOC-Weight/DocWeight/ " $f > ../%{name}.document - my_title=$(echo "%{summary}" | sed 's/[Pp][Dd][Ff]//;s/(.*)//') - #if grep -s -q '^Name *= *$' ../%{name}.document; then - sed -i " -s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document +# %{summary} is unreliable +# my_title=$(echo "%{summary}" \ +# | sed 's/$as $*[Pp][Dd][Ff]//;s/ *(.*)//') +# #if grep -s -q '^Name *= *$' ../%{name}.document; then +# sed -i " +# s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document # fi # if Name contains just "Documentation", add product info # FIXME: check this properly @@ -253,23 +272,52 @@ s/^$Name.*$=$.*$/\1=openSUSE \2/" ../%{name}.document fi fi - # make sure to sort startup guide first + # make sure to sort sles-startup guide first case %name in sles-startup*) [ $f = "./.directory" ] \ && sed -i "s|^$X-DOC-Weight$.*|\1=-2000|" $f ;; esac done -cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -cp %{S:100} $RPM_BUILD_ROOT%{my_desktopdir}/.directory || : +popd +if [ -d yelp ]; then + pushd yelp + for f in *.document; do + dir=${f%.document} + pdf_file=${dir/-pdf/.pdf} + dir=$(echo $dir | tr [:upper:] [:lower:]) + sed -i "s|^$DocPath=$.*|\1/usr/share/doc/manual/$dir/$pdf_file| +s|^Categories=.*|Categories=System;Core;Translation;Documentation| +s|^$Name.*$|\1 (PDF)|" $f + done +fi popd if [ %{my_lang} = "en" ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/help - cp %{name}.document $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document + for f in yelp/*.document; do + file=$(echo $f | tr [:upper:] [:lower:]) + cp $f $RPM_BUILD_ROOT%{_datadir}/help/${file#*/} + done + sed "s/Documentation *$Documentation$/\1/" %{name}.document \ + > $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document + # KDE4 + %define kdedir %{_datadir}/kde4/apps/khelpcenter/plugins + mkdir -p $RPM_BUILD_ROOT/%kdedir + pushd $RPM_BUILD_ROOT%{_datadir}/help + for doc in *.document; do + sed "\ +s/\[Document\]/[Desktop Entry]/ +" $doc >$RPM_BUILD_ROOT/%kdedir/${doc%\.document}.desktop + done + popd else mkdir -p $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang} - cp %{name}.document \ - $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document + for f in yelp/*.document; do + file=$(echo $f | tr [:upper:] [:lower:]) + cp $f $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/${file#*/} + done + sed "s/Documentation *$Documentation$/\1/" %{name}.document \ + > $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document fi # old stuff # Link it into the Gnome help system (must be found by calling @@ -290,74 +338,68 @@ install -d html/manual echo PDF only > html/manual/%{name} fi -if [ -f $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory ]; then - %suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory -fi cp %{S:10} . mkdir opensuse-installquick -cp %{S:13} opensuse-installquick/LICENSE.txt + cp %{S:20} . mkdir opensuse-gnomequick -cp %{S:23} opensuse-gnomequick/LICENSE.txt + cp %{S:30} . mkdir opensuse-kdequick -cp %{S:33} opensuse-kdequick/LICENSE.txt + cp %{S:40} . mkdir opensuse-reference -cp %{S:43} opensuse-reference/LICENSE.txt + cp %{S:50} . mkdir opensuse-startup -cp %{S:53} opensuse-startup/LICENSE.txt + #PDFINST %clean rm -fr ${RPM_BUILD_ROOT} -%files pdf -%defattr(-, root, root) -%dir %{_defaultdocdir} -# we ship opensuse-manual_$LL-pdf just because of the provides/obsoletes -%doc LICENSE.txt -# %doc *.pdf -%doc README-pdf #PDFXXX %files -n opensuse-installquick_de-pdf %defattr(-, root, root) %doc opensuse-installquick_de.pdf -%doc opensuse-installquick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-installquick_de-pdf.document %files -n opensuse-gnomequick_de-pdf %defattr(-, root, root) %doc opensuse-gnomequick_de.pdf -%doc opensuse-gnomequick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-gnomequick_de-pdf.document %files -n opensuse-kdequick_de-pdf %defattr(-, root, root) %doc opensuse-kdequick_de.pdf -%doc opensuse-kdequick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-kdequick_de-pdf.document %files -n opensuse-reference_de-pdf %defattr(-, root, root) %doc opensuse-reference_de.pdf -%doc opensuse-reference/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-reference_de-pdf.document %files -n opensuse-startup_de-pdf %defattr(-, root, root) %doc opensuse-startup_de.pdf -%doc opensuse-startup/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-startup_de-pdf.document + #PDFFILES %files %defattr(-, root, root) %dir %{_defaultdocdir} %doc html/manual -%{my_desktopdir} -%dir %{_datadir}/susehelp -%dir %{_datadir}/susehelp/meta +#GNOME -- probably obsolete now %{gnome_dir} %dir /usr/share/gnome %dir /usr/share/gnome/help +#recent GNOME %dir %{_datadir}/help -%{_datadir}/help/* +%dir %{_datadir}/help/LOCALE +%dir %{_datadir}/help/LOCALE/de +%{_datadir}/help/LOCALE/de/%{name}.document +#KDE4 + %changelog ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.6b2Vhi/_old 2010-09-27 17:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6b2Vhi/_new 2010-09-27 17:38:38.000000000 +0200 @@ -1,89 +1,119 @@ -group.opensuse-manuals_de Documentation/SUSE -license.opensuse-manuals_de GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-manuals_de openSUSE Manual (German) +group.opensuse-manuals_de Documentation/SUSE +license.opensuse-manuals_de GFDL v1.2 +summary.opensuse-manuals_de Complete set of openSUSE Manuals (HTML, German) +description.opensuse-manuals_de -The openSUSE manual package contains the Start-Up, Reference, AppArmor -Quick Start (English) , AppArmor Administration Guide (English), GNOME -and KDE Quick Start, GNOME and KDE User Guide (English), and the -Application Guide (English). +Contains the complete official openSUSE documentation in HTML +format. It can be accessed via the Desktop's help centers. +The following manuals are included: --description.opensuse-manuals_de -group.opensuse-installquick_de-pdf Documentation/SUSE -license.opensuse-installquick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-installquick_de-pdf openSUSE Install Quickstart (German) as PDF -+description.opensuse-installquick_de-pdf -PDF of the openSUSE Install Quickstart (German). +* Installation Quick Start --description.opensuse-installquick_de-pdf -group.opensuse-gnomequick_de-pdf Documentation/SUSE -license.opensuse-gnomequick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-gnomequick_de-pdf openSUSE GNOME Quickstart (German) as PDF -+description.opensuse-gnomequick_de-pdf -PDF of the openSUSE GNOME Quickstart (German). +* Start-Up + +* GNOME Quick Start + +* GNOME User Guide (English) +* KDE Quick Start + +* KDE User Guide (English) + +* Application Guide (English) + +* Reference + +* Security Guide (English) + +* AppArmor Quick Start (English) +-description.opensuse-manuals_de +group.opensuse-gnomequick_de-pdf Documentation/SUSE +license.opensuse-gnomequick_de-pdf GFDL v1.2 +summary.opensuse-gnomequick_de-pdf openSUSE manual: GNOME Quick Start (PDF, German) ++description.opensuse-gnomequick_de-pdf +A quick start guide to the GNOME desktop. -description.opensuse-gnomequick_de-pdf -group.opensuse-kdequick_de-pdf Documentation/SUSE -license.opensuse-kdequick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-kdequick_de-pdf openSUSE KDE Quickstart (German) as PDF +group.opensuse-kdequick_de-pdf Documentation/SUSE +license.opensuse-kdequick_de-pdf GFDL v1.2 +summary.opensuse-kdequick_de-pdf openSUSE manual: KDE Quick Start (PDF, German) +description.opensuse-kdequick_de-pdf -PDF of the openSUSE KDE Quickstart (German). - +A quick start guide to the KDE desktop. -description.opensuse-kdequick_de-pdf -group.opensuse-kdeuser_de-pdf Documentation/SUSE -license.opensuse-kdeuser_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-kdeuser_de-pdf openSUSE Manual (German) as PDF +group.opensuse-kdeuser_de-pdf Documentation/SUSE +license.opensuse-kdeuser_de-pdf GFDL v1.2 +summary.opensuse-kdeuser_de-pdf openSUSE manual KDE User Guide (PDF, German) +description.opensuse-kdeuser_de-pdf -PDF of the openSUSE Manual (German). - +This manual introduces the KDE desktop. It guides you through +using and configuring the desktop and helps you perform key +tasks. It is intended mainly for users who want to make +efficient use of KDE as their default desktop. -description.opensuse-kdeuser_de-pdf -group.opensuse-gnomeuser_de-pdf Documentation/SUSE -license.opensuse-gnomeuser_de-pdf GNU Free Documentation License, Version 1.1 (GFDL 1.1) -summary.opensuse-gnomeuser_de-pdf openSUSE GNOME User Guide (German) +group.opensuse-gnomeuser_de-pdf Documentation/SUSE +license.opensuse-gnomeuser_de-pdf GFDL v1.2 +summary.opensuse-gnomeuser_de-pdf openSUSE manual: GNOME User Guide (PDF, German) +description.opensuse-gnomeuser_de-pdf -This package contains the openSUSE GNOME User Guide (German). The KDE -User Guide is packaged together with the other openSUSE manuals as -opensuse-manual_de. - +This manual introduces the GNOME desktop. It guides you through +using and configuring the desktop and helps you perform key tasks. +It is intended mainly for end users who want to make efficient use +of GNOME desktop as their default desktop. -description.opensuse-gnomeuser_de-pdf -group.opensuse-apps_de-pdf Documentation/SUSE -license.opensuse-apps_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apps_de-pdf openSUSE Manual (German) as PDF +group.opensuse-apps_de-pdf Documentation/SUSE +license.opensuse-apps_de-pdf GFDL v1.2 +summary.opensuse-apps_de-pdf openSUSE manual: Application Guide (PDF, German) +description.opensuse-apps_de-pdf -PDF of the openSUSE Manual (German). - +Learn how to use and configure key desktop applications. This +guide introduces browsers and e-mail clients as well as office +applications and collaboration tools. It also covers graphics +and multimedia applications. -description.opensuse-apps_de-pdf -group.opensuse-reference_de-pdf Documentation/SUSE -license.opensuse-reference_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-reference_de-pdf openSUSE Manual (German) as PDF +group.opensuse-reference_de-pdf Documentation/SUSE +license.opensuse-reference_de-pdf GFDL v1.2 +summary.opensuse-reference_de-pdf openSUSE manual: Reference (PDF, German) +description.opensuse-reference_de-pdf -PDF of the openSUSE Manual (German). - +This guide gives you a general understanding of your system and +covers advanced system administration tasks. It is intended +mainly for system administrators and home users with basic system +administration knowledge. It provides detailed information about +advanced deployment scenarios, administration of your system, +the interaction of key system components and the set-up of +various network and file services. -description.opensuse-reference_de-pdf -group.opensuse-startup_de-pdf Documentation/SUSE -license.opensuse-startup_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-startup_de-pdf openSUSE Manual (German) as PDF +group.opensuse-startup_de-pdf Documentation/SUSE +license.opensuse-startup_de-pdf GFDL v1.2 +summary.opensuse-startup_de-pdf openSUSE manual: Start-Up (PDF, German) +description.opensuse-startup_de-pdf -PDF of the openSUSE Manual (German). - +Guides you through the installation and basic configuration of your +system. For newcomers, the manual also introduces basic Linux concepts +such as the file system, the user concept and access permissions and +gives an overview of the features the system offers to support +mobile computing. Provides help and advice in troubleshooting. -description.opensuse-startup_de-pdf -group.opensuse-apparmor-quick_de-pdf Documentation/SUSE -license.opensuse-apparmor-quick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apparmor-quick_de-pdf openSUSE Manual (German) as PDF +group.opensuse-apparmor-quick_de-pdf Documentation/SUSE +license.opensuse-apparmor-quick_de-pdf GFDL v1.2 +summary.opensuse-apparmor-quick_de-pdf openSUSE manual: AppArmor Quick Start +(PDF, German) +description.opensuse-apparmor-quick_de-pdf -PDF of the openSUSE Manual (German). - +A quick start guide to AppArmor, a security software. -description.opensuse-apparmor-quick_de-pdf -group.opensuse-apparmor-admin_de-pdf Documentation/SUSE -license.opensuse-apparmor-admin_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apparmor-admin_de-pdf openSUSE Manual (German) as PDF -+description.opensuse-apparmor-admin_de-pdf -PDF of the openSUSE Manual (German). - --description.opensuse-apparmor-admin_de-pdf -group.opensuse-manual_de-pdf Documentation/SUSE -license.opensuse-manual_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-manual_de-pdf openSUSE Manual (German) as PDF -+description.opensuse-manual_de-pdf -PDF of the openSUSE Manual (German). - --description.opensuse-manual_de-pdf +group.opensuse-manuals_de-pdf Documentation/SUSE +license.opensuse-manuals_de-pdf GFDL v1.2 +summary.opensuse-manuals_de-pdf ?????????????????? ++description.opensuse-manuals_de-pdf +?????????????????????????????????????? +-description.opensuse-manuals_de-pdf +group.opensuse-security_de Documentation/SUSE +license.opensuse-security_de-pdf GFDL v1.2 +summary.opensuse-security_de-pdf openSUSE manual: Security Guide (PDF, German) ++description.opensuse-security_de-pdf +This guide introduces basic concepts of system security, covering +both local and network security aspects. Shows how to make use of +the product inherent security software like AppArmor (which lets +you specify per program which files the program may read, write, +and execute) or the auditing system that reliably collects +information about any security-relevant events. +-description.opensuse-security_de-pdf +group.opensuse-installquick_de-pdf Documentation/SUSE +license.opensuse-installquick_de-pdf GFDL v1.2 +summary.opensuse-installquick_de-pdf openSUSE manual: Installation Quick Start (PDF, German) ++description.opensuse-installquick_de-pdf +A quick start guide providing a walk-through to the default installation. +-description.opensuse-installquick_de-pdf ++++++ doc_pre_checkin.sh ++++++ #!/bin/bash filename=$(echo *.spec) perl /usr/bin/update_spec $filename attributes > $filename.new mv $filename.new $filename exit 0 ++++++ opensuse-gnomequick_de.pdf ++++++ (binary differes) ++++++ opensuse-html_de-desktop.tar.bz2 ++++++ ++++ 2341 lines of diff (skipped) ++++++ opensuse-html_de-graphics.tar.bz2 ++++++ opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_de-html.tar.bz2 ++++++ opensuse-manuals_de/opensuse-html_de-html.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-html_de-html.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_de.tar.bz2 ++++++ ++++ 36749 lines of diff (skipped) ++++++ opensuse-installquick_de.pdf ++++++ (binary differes) ++++++ opensuse-kdequick_de.pdf ++++++ (binary differes) ++++++ opensuse-reference_de.pdf ++++++ (binary differes) ++++++ opensuse-startup_de.pdf ++++++ (binary differes) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mercurial for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Mon Sep 27 17:38:25 CEST 2010. -------- --- mercurial/mercurial.changes 2010-07-19 07:55:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2010-09-06 10:25:29.000000000 +0200 @@ -1,0 +2,81 @@ +Mon Sep 6 07:03:47 UTC 2010 - wr(a)rosenauer.org + +- update to 1.6.3: + * alias: make shadowing behavior more consistent (issue2054) + * bisect: better message for unrelated starting revisions + * bookmarks: Check if the bookmark to delete exists on the remote + * bookmarks: guard against listing bookmarks on unsupported repos + * chunkbuffer: use += rather than cStringIO to reduce memory footprint + * convert: Using --dest-type svn crashed, if the source repo used tags + * convert: properly set encoding for gnuarch converter + * convert: use encoding.encoding instead of locale.getpreferredencoding() + * graphlog: mark --branch as incompatible with --graph + * http basic auth: reset redirect counter on new requests (issue2255) + * httprepo: decompress stream incrementally to reduce memory usage + * log: fix the bug 'hg log --stat -p == hg log --stat' + * merge: drop reference to file contents after write + * merge: move reverse-merge logic out of filemerge (issue2342) + * merge: fix detection of conflict markers with checkconflicts enabled + * mq: don't inherit default and default-push paths with --mq (issue2333) + * resolve: updated help documentation for improved clarity + * revlog: drop cache after use to save memory footprint + * templatefilters: unnest uescape() + * templates: add filenolink to raw style (issue2332) + * url: expand vars in all [auth] settings (issue2328) + * url: limit expansion to safe auth keys (Issue2328) + * util: avoid using hashlib on Python < 2.5 (issue2278) + * verify: initialize rp variable in case we hit out of memory + * verify: reduce memory footprint when unpacking files + * verify: report exceptions that don't have a str() method +- in case of !with_doc copy the man pages from the source tarball + +------------------------------------------------------------------- +Wed Aug 4 09:09:51 UTC 2010 - pascal.bleser(a)opensuse.org + +- split out localization of messages into its own -lang subpackage, which reduces the size of the mercurial package by around 400kb +- the locale files are moved into the arch-independent %{python_sitelib} instead of %{python_sitearch} in order to have a noarch -lang subpackage +- use --record-rpm for the list of files + +- update to 1.6.2: + * fixes a regression in the color extension + +- changes from 1.6.1: + * alias: ensure checksignature() is applied directly to the command (issue2286) + * bash/zsh completion: use HGPLAIN when invoking hg (issue2297) + * bookmarks: don't allow name to contain whitespaces only + * bookmarks: ensure current bookmark is updated when specified with -r . + * bundle: lookup revisions after addbranchrevs + * color/progress: subclass ui instead of using wrapfunction (issue2096) + * commit: only warn when reopening the workdir's branch + * dispatch: give better error message when cwd doesn't exist (issue2293) + * doc: make sure we use our own code for generating man pages + * filelog: cmp: don't read data if hashes are identical (issue2273) + * filelog: test behaviour for data starting with "\1\n" + * hg.clone: fix branch value when passing a repo object (issue2267) + * hgweb.wsgi: add a URL to the corresponding wiki documentation + * hgwebdir: allow pure relative globs in paths + * hgwebdir: use template paths configured in the hgrc (issue2281) + * init: create target directory recursively + * inotify: check all components of filenames against hgignore (issue884) + * keyword: move collecting of [keyword] patterns to reposetup (issue2303) + * log: fix missing diff output for hg log -p in subdirectory + * log: follow filenames through renames (issue647) + * mail: ensure that Python2.4 to 2.7 use the same header format + * mq: clarify the fact that qimport is trying to read a file + * mq: cleanup status if applied mq is stripped (issue1881) + * mq: fixed ENOENT when qrename to new/directory.patch + * mq: reset self.added after the mq transaction instead of inside qimport + * qpush --move: move the right patch even with comment lines + * rebase: re-add patches to mq repo after rebase + * revert: rename original to .orig instead of copying (issue2282) + * revset: fix ancestor subset handling (issue2298) + * runrst: try to be more helpful if docutils is not installed + * tag: do not allow tag names to consist solely of whitespace (issue2307) + * transplant: crash if repo.commit() finds nothing to commit + +------------------------------------------------------------------- +Thu Jul 29 23:00:35 CEST 2010 - wr(a)rosenauer.org + +- install bash_completion file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mercurial-1.6.tar.bz2 New: ---- mercurial-1.6.3.tar.bz2 rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.T4V3gw/_old 2010-09-27 17:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.T4V3gw/_new 2010-09-27 17:38:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mercurial (Version 1.6) +# spec file for package mercurial (Version 1.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,24 +17,42 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +%if 0%{?suse_version} >= 1100 +%define with_doc 1 +%endif +%if 0%{?suse_version} >= 1110 +%define with_lang 1 +%endif Name: mercurial -BuildRequires: asciidoc gcc python-devel sgml-skel xmlto -%if %suse_version > 1020 +BuildRequires: gcc python-devel +%if 0%{?with_doc} +BuildRequires: asciidoc sgml-skel xmlto +%endif +BuildRequires: perl +%if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif Summary: Scalable Distributed SCM -Version: 1.6 +Version: 1.6.3 Release: 1 License: GPLv2+ Group: Development/Tools/Version Control BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.selenic.com/mercurial/ +# http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz Source: %{name}-%{version}.tar.bz2 +Source99: rpmlintrc Patch: mercurial-hgk-path-fix.diff Patch1: mercurial-sle10-inotify-fixes.diff # require rcs for 3-way "merge" command. Requires: rcs +%if 0%{?with_lang} +Recommends: %{name}-lang +%endif %py_requires %description @@ -42,6 +60,7 @@ designed for efficient handling of very large distributed projects. +%lang_package %prep %setup -q # %setup -n %{name}-%{version}-mq @@ -52,44 +71,92 @@ %patch1 -p1 %build -make all PREFIX=/usr +%__make \ + build \ +%if 0%{?with_doc} + doc \ +%endif + PREFIX="{_prefix}" %install -python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" -make -C doc DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr install +%__python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" \ + --record-rpm=files.lst + +%if 0%{?with_doc} +%__make -C doc DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install +%else +pushd doc +for f in hg.1 hgrc.5 hgignore.5 ; do + %__gzip $f && f=$f.gz + ff="${f##*/}" + n="${ff%.gz}" + n="${n##*.}" + %__install -D -m0644 "$f" "%{buildroot}%{_mandir}/man$n/$ff" +done +popd +%endif # install programs in contrib install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/shrink-revlog.py $RPM_BUILD_ROOT%{_bindir} -python%{py_ver} %{py_libdir}/compileall.py -d %{py_site}/ \ - $RPM_BUILD_ROOT/%{py_sitedir} -# FIXME: the file seems buggy on mercurial-0.7 -# mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d -# install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh + +%__python -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}/",ddir="%{python_sitearch}/",force=True)' + +mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d +install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d -%if %suse_version > 1020 -%fdupes -s $RPM_BUILD_ROOT +%if 0%{?suse_version} > 1020 +%fdupes -s "%{buildroot}%{_datadir}" +%endif + +if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then + %__install -d "%{buildroot}%{python_sitelib}/mercurial" + %__mv "%{buildroot}%{python_sitearch}/mercurial/locale" \ + "%{buildroot}%{python_sitelib}/mercurial/locale" +fi + +%__perl -n -i -e 'print unless m,/mercurial/locale(/?|/.+)$,' files.lst +LANGFILES="$PWD/%{name}.lang" +>"$LANGFILES" +pushd "%{buildroot}%{python_sitelib}/mercurial/locale" +/bin/ls -1 | while read lang; do + echo "%lang($lang) %{python_sitelib}/mercurial/locale/$lang" >>"$LANGFILES" +done +popd #%python_sitelib/mercurial/locale + +%if ! 0%{?with_lang} +%__mv files.lst files.lst.orig +cat files.lst.orig "%{name}.lang" > files.lst +%__rm files.lst.orig %endif %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} -%files +%files -f files.lst %defattr(-, root, root) %doc README CONTRIBUTORS COPYING hgweb.cgi -%{_mandir}/man?/* %doc contrib/sample.hgrc %{_bindir}/* -%{py_sitedir}/* -# FIXME: buggy file -# /etc/bash_completion.d/* +#%{python_sitelib} +/etc/bash_completion.d/* %dir /etc/mercurial %dir /etc/mercurial/hgrc.d %{_datadir}/emacs %{_datadir}/xemacs +%{_mandir}/man1/hg.1%{ext_man} +%{_mandir}/man5/hgignore.5%{ext_man} +%{_mandir}/man5/hgrc.5%{ext_man} +%if 0%{?with_lang} + +%files lang -f %{name}.lang +%defattr(-, root, root) +%endif +%dir %{python_sitelib}/mercurial +%dir %{python_sitelib}/mercurial/locale %changelog ++++++ mercurial-1.6.tar.bz2 -> mercurial-1.6.3.tar.bz2 ++++++ ++++ 13093 lines of diff (skipped) ++++++ rpmlintrc ++++++ addFilter("python-naming-policy-not-applied") addFilter("non-conffile-in-etc /etc/bash_completion.d/mercurial.sh") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon Sep 27 17:37:49 CEST 2010. -------- --- libqt4/libqt4-devel-doc-data.changes 2010-09-06 10:35:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2010-09-27 00:30:12.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 27 00:29:25 CEST 2010 - dmueller(a)suse.de + +- add patch to avoid jumps in QTreeViews when deleting the + current item + +------------------------------------------------------------------- +Wed Sep 22 10:25:53 CEST 2010 - dmueller(a)suse.de + +- update to 4.7.0 (final): + * minor bugfixes over 4.7.0 RC1 + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: ---- ignore-global-advance-width-in-fonts.diff minimal-toc-for-webkit.diff qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 New: ---- 6da6b7099d4e0b49329793e4b90703ec3d868048.diff qt-everywhere-opensource-src-4.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.6.95+4.7.0rc1) +# spec file for package libqt4-devel-doc-data (Version 4.7.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,11 +27,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.95+4.7.0rc1 -Release: 2 +Version: 4.7.0 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.7.0-rc1 +%define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -63,7 +63,6 @@ Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: konsole-nvidia-font-speed.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch @@ -72,13 +71,13 @@ Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff Patch107: webkit-ia64_s390x.patch -Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff +Patch122: 6da6b7099d4e0b49329793e4b90703ec3d868048.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -116,8 +115,6 @@ %patch41 %patch43 # ### 47 rediff -#%patch55 -# ### 47 rediff # %patch60 # bnc#374073 comment #8 # %patch61 @@ -129,16 +126,14 @@ # %patch102 # ### 47 rediff # %patch107 -# ### 47 rediff -#%patch108 %patch109 -# ### 47 rediff -#%patch113 +%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif +%patch122 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.6.95+4.7.0rc1) +# spec file for package libqt4 (Version 4.7.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,11 +53,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.6.95+4.7.0rc1 -Release: 2 +Version: 4.7.0 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.7.0-rc1 +%define rversion %version # COMMON-VERSION-END # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -80,7 +80,6 @@ Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: konsole-nvidia-font-speed.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch @@ -89,13 +88,13 @@ Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff Patch107: webkit-ia64_s390x.patch -Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff +Patch122: 6da6b7099d4e0b49329793e4b90703ec3d868048.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -133,8 +132,6 @@ %patch41 %patch43 # ### 47 rediff -#%patch55 -# ### 47 rediff # %patch60 # bnc#374073 comment #8 # %patch61 @@ -146,16 +143,14 @@ # %patch102 # ### 47 rediff # %patch107 -# ### 47 rediff -#%patch108 %patch109 -# ### 47 rediff -#%patch113 +%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif +%patch122 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ 6da6b7099d4e0b49329793e4b90703ec3d868048.diff ++++++ commit 6da6b7099d4e0b49329793e4b90703ec3d868048 Author: Frank Reininghaus <frank78ac(a)googlemail.com> Date: Wed Sep 22 10:19:59 2010 +0200 QTreeView: do not scroll to top if last item is removed When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart(a)nokia.com> diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index b797776..40b51fe 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() if (!viewportSize.isValid()) viewportSize = QSize(0, 0); + if (viewItems.isEmpty()) { + q->doItemsLayout(); + } + int itemsInViewport = 0; if (uniformRowHeights) { if (defaultItemHeight <= 0) ++++++ ppc64-webkit-link-fix.diff ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,10 +1,10 @@ --- src/3rdparty/webkit/WebCore/WebCore.pro +++ src/3rdparty/webkit/WebCore/WebCore.pro -@@ -60,7 +60,6 @@ +@@ -90,7 +90,6 @@ } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - CONFIG(release):!CONFIG(QTDIR_build) { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + CONFIG(release):!CONFIG(standalone_package) { ++++++ qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 -> qt-everywhere-opensource-src-4.7.0.tar.bz2 ++++++ libqt4/qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-everywhere-opensource-src-4.7.0.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-mozilla for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package ca-certificates-mozilla for openSUSE:Factory checked in at Mon Sep 27 17:33:58 CEST 2010. -------- --- ca-certificates-mozilla/ca-certificates-mozilla.changes 2010-05-21 14:31:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/ca-certificates-mozilla/ca-certificates-mozilla.changes 2010-09-27 16:43:59.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 27 14:27:52 UTC 2010 - lnussel(a)suse.de + +- update certificates to revision 1.65 + * new: E_Guven_Kok_Elektronik_Sertifika_Hizmet_Saglayicisi.pem + * new: GlobalSign_Root_CA_R3.pem + * new: Microsec_e_Szigno_Root_CA_2009.pem + * new: Verisign_Class_1_Public_Primary_Certification_Authority.1.pem + * new: Verisign_Class_3_Public_Primary_Certification_Authority.1.pem + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- certdata.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates-mozilla.spec ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ca-certificates-mozilla (Version 1.64) +# spec file for package ca-certificates-mozilla (Version 1.65) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ License: BSD3c(or similar) ; MPL 1.1/GPL 2.0/LGPL 2.1 Group: Productivity/Networking/Security AutoReqProv: on -Version: 1.64 +Version: 1.65 Release: 1 Summary: CA certificates for OpenSSL Url: http://www.mozilla.org @@ -44,6 +44,7 @@ Source1: extractcerts.pl Source2: %{name}.COPYING Source3: compareoldnew +Patch0: certdata.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # for update-ca-certificates @@ -61,10 +62,12 @@ %prep %setup -qcT +/bin/cp %{SOURCE0} . +%patch0 -p1 install -m 644 %{S:1} COPYING %build -perl %{SOURCE1} --trustbits < %{SOURCE0} +perl %{SOURCE1} --trustbits < certdata.txt %install mkdir -p %{buildroot}/%{sslusrdir}/mozilla ++++++ certdata.diff ++++++ Index: ca-certificates-mozilla/certdata.txt =================================================================== --- ca-certificates-mozilla.orig/certdata.txt +++ ca-certificates-mozilla/certdata.txt @@ -4646,7 +4646,7 @@ CKA_ISSUER MULTILINE_OCTAL \144\040\103\101\040\122\157\157\164 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++++++ certdata.txt ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -34,7 +34,7 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64 $ $Date: 2010/04/08 14:28:59 $" +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.65 $ $Date: 2010/08/27 15:45:14 $" # # certdata.txt @@ -20924,5 +20924,587 @@ END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "Verisign Class 1 Public Primary Certification Authority" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +\344\335 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360 +\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206 +\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141 +\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 +\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\066 +\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155 +\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215 +\000\060\201\211\002\201\201\000\345\031\277\155\243\126\141\055 +\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016 +\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037 +\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163 +\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006 +\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342 +\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311 +\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052 +\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006 +\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011 +\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226 +\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035 +\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376 +\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025 +\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066 +\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372 +\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133 +END + +# Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352 +\350\175\140\361 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036 +END +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +\344\335 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Verisign Class 3 Public Primary Certification Authority" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +\022\276 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366 +\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206 +\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141 +\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 +\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\066 +\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155 +\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215 +\000\060\201\211\002\201\201\000\311\134\131\236\362\033\212\001 +\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014 +\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104 +\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326 +\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071 +\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254 +\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205 +\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161 +\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006 +\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176 +\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042 +\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215 +\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165 +\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011 +\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221 +\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172 +\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220 +END + +# Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002 +\100\260\256\153 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304 +END +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +\022\276 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Microsec e-Szigno Root CA 2009" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\302\176\103\004\116\107\077\031 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000 +\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206 +\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003 +\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007 +\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003 +\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164 +\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143 +\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122 +\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006 +\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157 +\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015 +\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062 +\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061 +\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017 +\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061 +\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163 +\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003 +\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151 +\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071 +\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026 +\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150 +\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001 +\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001 +\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317 +\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175 +\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165 +\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134 +\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330 +\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034 +\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024 +\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116 +\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002 +\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373 +\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032 +\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247 +\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302 +\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044 +\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203 +\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265 +\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003 +\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 +\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 +\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075 +\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003 +\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314 +\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006 +\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145 +\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206 +\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321 +\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223 +\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041 +\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312 +\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124 +\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244 +\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242 +\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131 +\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371 +\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036 +\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207 +\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334 +\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141 +\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070 +\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155 +\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311 +\202\042\055\172\124\253\160\303\175\042\145\202\160\226 +END + +# Trust for Certificate "Microsec e-Szigno Root CA 2009" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221 +\341\001\061\216 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261 +END +CKA_ISSUER MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\302\176\103\004\116\107\077\031 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +\254\265 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104 +\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165 +\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060 +\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156 +\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151 +\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003 +\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154 +\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151 +\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171 +\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061 +\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061 +\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006 +\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105 +\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040 +\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074 +\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156 +\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040 +\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164 +\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042 +\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040 +\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325 +\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124 +\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363 +\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234 +\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123 +\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013 +\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213 +\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307 +\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274 +\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060 +\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002 +\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054 +\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256 +\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265 +\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224 +\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001 +\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026 +\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004 +\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015 +\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143 +\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317 +\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012 +\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337 +\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122 +\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164 +\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147 +\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343 +\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234 +\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237 +\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227 +\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056 +\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353 +\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152 +\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010 +\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043 +\336\102\343\055\202\361\017\345\372\227 +END + +# Trust for Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261 +\375\231\101\064 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133 +END +CKA_ISSUER MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +\254\265 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "GlobalSign Root CA - R3" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R3" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\004\000\000\000\000\001\041\130\123\010\242 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004 +\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206 +\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006 +\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156 +\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060 +\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151 +\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157 +\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061 +\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070 +\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125 +\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122 +\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006 +\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156 +\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141 +\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110 +\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001 +\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365 +\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374 +\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202 +\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243 +\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023 +\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337 +\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260 +\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246 +\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254 +\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365 +\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335 +\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351 +\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377 +\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031 +\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233 +\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161 +\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060 +\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250 +\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060 +\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202 +\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124 +\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312 +\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212 +\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051 +\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123 +\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203 +\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212 +\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000 +\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025 +\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027 +\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125 +\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213 +\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054 +\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057 +\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162 +\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107 +\130\077\137 +END + +# Trust for Certificate "GlobalSign Root CA - R3" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R3" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133 +\205\151\166\255 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050 +END +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\004\000\000\000\000\001\041\130\123\010\242 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++++++ compareoldnew ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -15,11 +15,15 @@ mkdir old new cd old echo old... -VERBOSE=1 ../extractcerts.pl < ../.osc/certdata.txt | sort > ../old.files +VERBOSE=1 ../extractcerts.pl --trustbits < ../.osc/certdata.txt > tmp +sort < tmp > ../old.files +rm -f tmp cd .. cd new echo new... -VERBOSE=1 ../extractcerts.pl < ../certdata.txt | sort > ../new.files +VERBOSE=1 ../extractcerts.pl --trustbits < ../certdata.txt > tmp +sort < tmp > ../new.files +rm -f tmp cd .. echo '----------------------------' while read line; do ++++++ extractcerts.pl ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -75,6 +75,11 @@ $output_trustbits = 1; } +sub colonhex +{ + return join(':', unpack("(H2)*", $_[0])); +} + sub handle_object($) { my $object = shift; @@ -83,8 +88,9 @@ push @certificates, $object; } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_TRUST') { my $label = $object->{'CKA_LABEL'}; - die "$label exists" if exists($trusts{$label}); - $trusts{$label} = $object; + my $serial = colonhex($object->{'CKA_SERIAL_NUMBER'}); + die "$label exists ($serial)" if exists($trusts{$label.$serial}); + $trusts{$label.$serial} = $object; } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_BUILTIN_ROOT_LIST') { # ignore } else { @@ -116,11 +122,12 @@ } if( $fields[1] =~ /MULTILINE/ ) { + die "expected MULTILINE_OCTAL" unless $fields[1] eq 'MULTILINE_OCTAL'; $fields[2] = ""; while(<>) { last if /END/; chomp; - $fields[2] .= $_; + $fields[2] .= pack("C", oct($+)) while $_ =~ /\G\\([0-3][0-7][0-7])/g; } } @@ -133,17 +140,19 @@ $object->{$fields[0]} = $fields[2]; } handle_object($object); +undef $object; use MIME::Base64; for my $cert (@certificates) { my $alias = $cert->{'CKA_LABEL'}; - if(!exists($trusts{$alias})) { + my $serial = colonhex($cert->{'CKA_SERIAL_NUMBER'}); + if(!exists($trusts{$alias.$serial})) { print STDERR "NO TRUST: $alias\n"; next; } # check trust. We only include certificates that are trusted for identifying # web sites - my $trust = $trusts{$alias}; + my $trust = $trusts{$alias.$serial}; my @addtrust; my @addtrust_openssl; my $trusted; @@ -178,16 +187,22 @@ my $file = $alias; $alias =~ s/'/-/g; $file =~ s/[^[:alnum:]\\]+/_/g; - $file .= '.pem'; $file = Encode::encode("UTF-8", $file); + if (-e $file.'.pem') { + my $i = 1; + while (-e $file.".$i.pem") { + ++$i; + } + $file .= ".$i.pem"; + } else { + $file .= '.pem'; + } if (!open(O, '>', $file)) { print STDERR "$file: $!\n"; next; } print "$file\n" if $ENV{'VERBOSE'}; my $value = $cert->{'CKA_VALUE'}; - my $enc = ''; - $enc .= pack("C", oct($+)) while $value =~ /\G\\([0-3][0-7][0-7])/g; if ($output_trustbits) { print O "# alias=",Encode::encode("UTF-8", $alias),"\n"; print O "# trust=",join(" ", @addtrust),"\n"; @@ -196,7 +211,7 @@ } } print O "-----BEGIN CERTIFICATE-----\n"; - print O encode_base64($enc); + print O encode_base64($value); print O "-----END CERTIFICATE-----\n"; close O; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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