February 2007 - openSUSE Commits - openSUSE Mailing Lists

commit sgml-skel
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package sgml-skel checked in at Fri Feb 2 13:04:39 CET 2007. -------- --- sgml-skel/sgml-skel.changes 2006-08-14 16:41:38.000000000 +0200 +++ /mounts/work_src_done/NOARCH/sgml-skel/sgml-skel.changes 2007-01-29 11:00:34.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 29 10:59:15 CET 2007 - ke(a)suse.de + +- Fix debug code in edit-xml-catalog. Reported by Andreas Hanke and + Dirk Mueller [# 237652]. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sgml-skel.spec ++++++ --- /var/tmp/diff_new_pack.v20999/_old 2007-02-02 13:04:26.000000000 +0100 +++ /var/tmp/diff_new_pack.v20999/_new 2007-02-02 13:04:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sgml-skel (Version 0.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,12 +14,12 @@ BuildRequires: libxml2 Summary: Helper Scripts for the SGML System Version: 0.6 -Release: 281 +Release: 305 Group: Productivity/Publishing/SGML Requires: libxml2 PreReq: /bin/awk #Provides: -License: GPL +License: GNU General Public License (GPL) # URL: Source0: http://www.suse.de/~ke/%{name}/%{name}-%{version}.tar.bz2 # :pserver:anoncvs@sources.redhat.com:/cvs/docbook-tools @@ -91,6 +91,9 @@ %dir /var/lib/sgml %changelog -n sgml-skel +* Mon Jan 29 2007 - ke(a)suse.de +- Fix debug code in edit-xml-catalog. Reported by Andreas Hanke and + Dirk Mueller [# 237652]. * Mon Aug 14 2006 - ke(a)suse.de - Provide /etc/xml/catalog. - SuSEconfig.sgml-skel: Remove it. It was required to solve on update @@ -152,16 +155,16 @@ - Add install-catalog.sh (from CVS:docbook-tools/sgml-common). * Mon May 27 2002 - ke(a)suse.de - Update to version 0.5: -- New scripts: sgml2xmlcat.sh (re-written, replacement for + - New scripts: sgml2xmlcat.sh (re-written, replacement for sgmlcat2x.sh) and parse-sgml-catalog.sh to normalized SGML Open catalogs. * Mon May 06 2002 - ke(a)suse.de - Add sgmlcat2x.sh to parse normalized traditional SGML catalog files. * Mon Aug 27 2001 - ke(a)suse.de - Update to version 0.2 (now it's a proper package): -- Recognize ISO identifiers (additionally to '-//' and '+//' owner + - Recognize ISO identifiers (additionally to '-//' and '+//' owner tags). -- Handle language and version field. -- More error checking. + - Handle language and version field. + - More error checking. * Thu Mar 22 2001 - ke(a)suse.de - New package. ++++++ edit-xml-catalog.sh ++++++ --- sgml-skel/edit-xml-catalog.sh 2004-08-25 08:38:27.000000000 +0200 +++ /mounts/work_src_done/NOARCH/sgml-skel/edit-xml-catalog.sh 2007-01-29 10:58:07.000000000 +0100 @@ -13,6 +13,7 @@ ROOTCATALOG=/etc/xml/catalog mode=add +echo=true while test $# -gt 0; do # while true ; do case "$1" in @@ -84,7 +85,7 @@ del_entry () { pattern=$FOR_ROOT_CAT - echo $pattern + $echo $pattern if [ -r $ROOTCATALOG ]; then # Either delete <group>...</group> # or ... ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gaim
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package gaim checked in at Fri Feb 2 13:04:31 CET 2007. -------- --- GNOME/gaim/gaim.changes 2007-01-11 12:07:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/gaim/gaim.changes 2007-02-01 23:36:04.844780000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 1 23:35:18 CET 2007 - jhargadon(a)suse.de + +- updated gaim-defaults.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gaim.spec ++++++ --- /var/tmp/diff_new_pack.V14183/_old 2007-02-02 13:01:49.000000000 +0100 +++ /var/tmp/diff_new_pack.V14183/_new 2007-02-02 13:01:49.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: doxygen evolution-data-server-devel gnome-icon-theme gnome-keyring-devel graphviz gtkspell-devel libao-devel libbonobo-devel libstdc++-devel startup-notification-devel tk-devel update-desktop-files Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 1.5.0 -Release: 96 +Release: 97 License: GNU General Public License (GPL) Group: Productivity/Networking/AOLInstantMessenger Conflicts: gaim-applet @@ -235,6 +235,8 @@ %{_includedir}/gaim %changelog -n gaim +* Thu Feb 01 2007 - jhargadon(a)suse.de +- updated gaim-defaults.patch * Thu Jan 11 2007 - sbrabec(a)suse.de - More spec file cleanups. * Wed Dec 13 2006 - maw(a)suse.de ++++++ gaim-defaults.patch ++++++ --- /var/tmp/diff_new_pack.V14183/_old 2007-02-02 13:01:50.000000000 +0100 +++ /var/tmp/diff_new_pack.V14183/_new 2007-02-02 13:01:50.000000000 +0100 @@ -195,15 +195,15 @@ files = gaim_prefs_get_string_list(key); + if (files == NULL) { -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/ssl-gnutls.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/ssl.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/autorecon.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/docklet.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/gaim-remote.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/history.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/notify.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/spellchk.so")); -+ files = g_list_append (files, g_strdup("/opt/gnome/lib/gaim/statenotify.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/ssl-gnutls.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/ssl.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/autorecon.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/docklet.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/gaim-remote.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/history.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/notify.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/spellchk.so")); ++ files = g_list_append (files, g_strdup("/usr/lib/gaim/statenotify.so")); + } + for (f = files; f; f = f->next) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdm
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package gdm checked in at Fri Feb 2 13:04:27 CET 2007. -------- --- GNOME/gdm/gdm.changes 2007-01-23 18:18:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2007-01-31 16:28:02.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 16:27:35 CET 2007 - sbrabec(a)suse.cz + +- Fixed PreReq for /etc/init.d/xdm in older products. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.q14870/_old 2007-02-02 13:01:52.000000000 +0100 +++ /var/tmp/diff_new_pack.q14870/_new 2007-02-02 13:01:52.000000000 +0100 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 50 +Release: 51 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -57,6 +57,9 @@ Docdir: %{_defaultdocdir} Provides: gdm2 Obsoletes: gdm2 +%if %suse_version <= 1020 +PreReq: xorg-x11 +%endif Requires: gnome2-SuSE gnome-themes klogd xorg-x11-Xnest %description @@ -222,6 +225,8 @@ %dir /usr/share/xsessions %changelog -n gdm +* Wed Jan 31 2007 - sbrabec(a)suse.cz +- Fixed PreReq for /etc/init.d/xdm in older products. * Tue Jan 23 2007 - sbrabec(a)suse.cz - Update /etc/init.d/xdm on older products. * Thu Jan 04 2007 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 moodle
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package moodle checked in at Fri Feb 2 13:01:52 CET 2007. -------- --- moodle/moodle.changes 2006-11-17 07:06:05.000000000 +0100 +++ /mounts/work_src_done/NOARCH/moodle/moodle.changes 2007-01-31 08:55:38.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Jan 23 22:32:08 CET 2007 - lrupp(a)suse.de +- updated moodle to 1.7.1 (bugfix release) +- updated language packs +- fixed requires for SLES9 +- added triggerpostun for old config move +- added 'de_du' package + +------------------------------------------------------------------- +Tue Dec 19 20:11:34 CET 2006 - lrupp(a)suse.de + +- some enhancements in the moodle-add-user script +- changed default currency to "EUR" instead of "USD" in the database + +------------------------------------------------------------------- +Thu Dec 7 23:11:33 CET 2006 - lrupp(a)suse.de + +- Updated ca, en, es, eu, fr, ja, ko, tr and vi language files +- updated setup and plugin script in moodle-oss.tar.bz2 + +------------------------------------------------------------------- Old: ---- buildit-local get_sources.sh moodle-1.7.tar.bz2 New: ---- de_du_utf8.zip moodle-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moodle.spec ++++++ --- /var/tmp/diff_new_pack.c10564/_old 2007-02-02 13:01:17.000000000 +0100 +++ /var/tmp/diff_new_pack.c10564/_new 2007-02-02 13:01:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package moodle (Version 1.7) +# spec file for package moodle (Version 1.7.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -16,9 +16,9 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Networking/Web/Utilities Autoreqprov: no -Version: 1.7 -Release: 4 -Source: moodle-1.7.tar.bz2 +Version: 1.7.1 +Release: 1 +Source: moodle-1.7.1.tar.bz2 Source2: cron-moodle Source3: moodle_include.conf Source4: moodle.config.dummy @@ -78,22 +78,25 @@ Source161: uk_utf8.zip Source162: vi_utf8.zip Source163: zh_cn_utf8.zip +Source164: de_du_utf8.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prereq: mysql -%if %sles_version == 9 BuildRequires: apache2-devel -Requires: apache2 mysql cron mod_php php4-gd php4-mysql php4-imap php4-session php4-zlib php4-gettext php4-mbstring php4-iconv +Requires: apache2 mysql cron +%if %sles_version == 9 +Requires: apache2-mod_php4 php4-gd php4-mysql php4-gettext php4-imap php4-session php4-mbstring php4-iconv php4-zlib +Requires: php4-mcrypt %else -BuildRequires: apache2-devel -Requires: apache2 mysql cron mod_php_any php php-zlib php-gd php-mysql php-gettext php-mcrypt php-imap php-session php5-pear-file php5-pear-mail php5-pear-mail_mime +Requires: mod_php_any php-gd php-mysql php-gettext php-imap php-session php-mbstring php-iconv php-zlib +Requires: php-mcrypt php5-pear-file php5-pear-mail php5-pear-mail_mime %endif %define apache_serverroot %(/usr/sbin/apxs2 -q DATADIR) %define apache_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR) %define moodlerootdir %{apache_serverroot}/htdocs/moodle/ %define moodledatadir %{apache_serverroot}/moodledata -%define moodleconfigdir %{_sysconfdir} -%define moodleurl http://localhost/moodle/ +%define moodleconfigdir %{apache_serverroot}/inc +%define moodleurl http://localhost/moodle %define crondir %{_sysconfdir}/cron.d # skip test for devel dependencies required by libtool .la files: skip-check-libtool-deps @@ -356,6 +359,34 @@ %defattr (-,root,root,-) %{moodlerootdir}/lang/de_utf8* #---------------------------------------------------------------------- +%package de_du +Summary: Moodle language pack for German (uses 'Du' instead of 'Sie') +Group: Productivity/Networking/Web/Utilities +Requires: moodle = %{version}-%{release} +%if %suse_version >= 1010 +Provides: locale(moodle:de) +%endif + +%description de_du +This package contains files needed to display Moodle in German. Instead +of using 'Sie' this packages contains 'Du' translations. + + + +Authors: +-------- + Lead Developer - Martin Dougiamas + Knight in Shining Armor - Eloy Lafuente (stronk7) + Translation Coordinator - Koen Roggemans + Security Officer - Petr Škoda (skodak) + Documentation Steward - Helen Foster + Themes Manager - Urs Hunkler + + +%files de_du +%defattr (-,root,root,-) +%{moodlerootdir}/lang/de_du* +#---------------------------------------------------------------------- %package el Summary: Moodle language pack for Greek Group: Productivity/Networking/Web/Utilities @@ -1557,122 +1588,139 @@ # if the following command fails, then apache dependencies are not met /usr/sbin/apxs2 -q datadir >/dev/null # we don't need these files at all... -%{__rm} $RPM_BUILD_DIR/%{name}/filter/tex/mimetex.darwin -%{__rm} $RPM_BUILD_DIR/%{name}/filter/tex/mimetex.freebsd -#%{__rm} $RPM_BUILD_DIR/%{name}/install.php +#%{__rm} $RPM_BUILD_DIR/%{name}/filter/tex/mimetex.darwin +#%{__rm} $RPM_BUILD_DIR/%{name}/filter/tex/mimetex.freebsd # --------------------------------------------------------------------------- %install -%{__mkdir_p} $RPM_BUILD_ROOT/%{moodlerootdir} -%{__mkdir_p} $RPM_BUILD_ROOT/%{moodledatadir}/{1,2,cache,quarantine,sessions,temp,users,backup} -%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d -%{__mkdir_p} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/ -%{__mkdir_p} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -%{__cp} -a * $RPM_BUILD_ROOT/%{moodlerootdir} +%{__mkdir_p} %{buildroot}/%{moodlerootdir} +%{__mkdir_p} %{buildroot}/%{moodledatadir}/{1,2,cache,quarantine,sessions,temp,users,backup} +%{__mkdir_p} %{buildroot}/%{moodleconfigdir} +%{__mkdir_p} %{buildroot}/%{_sysconfdir}/cron.d +%{__mkdir_p} %{buildroot}/%{apache_sysconfdir}/conf.d/ +%{__mkdir_p} %{buildroot}/%{_defaultdocdir}/%{name} +%{__cp} -a * %{buildroot}/%{moodlerootdir} # moodle language packs -cd $RPM_BUILD_ROOT%{moodlerootdir}/lang/ -install %{SOURCE110} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE111} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE112} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE113} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE114} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE115} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE116} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE117} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE118} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE119} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE120} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE121} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE122} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE123} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE124} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE125} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE126} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE127} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE128} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE129} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE130} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE131} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE132} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE133} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE134} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE135} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE136} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE137} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE138} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE139} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE140} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE141} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE142} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE143} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE144} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE145} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE146} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE147} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE148} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE149} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE150} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE151} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE152} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE153} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE154} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE155} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE156} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE157} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE158} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE159} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE160} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE161} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE162} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -install %{SOURCE163} $RPM_BUILD_ROOT%{moodlerootdir}lang/ -pushd $RPM_BUILD_ROOT%{moodlerootdir}lang 1>/dev/null -for lang in $RPM_BUILD_ROOT%{moodlerootdir}lang/*.zip; do +cd %{buildroot}/%{moodlerootdir}/lang/ +install %{SOURCE110} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE111} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE112} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE113} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE114} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE115} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE116} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE117} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE118} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE119} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE120} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE121} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE122} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE123} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE124} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE125} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE126} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE127} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE128} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE129} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE130} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE131} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE132} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE133} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE134} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE135} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE136} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE137} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE138} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE139} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE140} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE141} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE142} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE143} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE144} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE145} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE146} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE147} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE148} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE149} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE150} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE151} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE152} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE153} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE154} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE155} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE156} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE157} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE158} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE159} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE160} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE161} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE162} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE163} %{buildroot}/%{moodlerootdir}lang/ +install %{SOURCE164} %{buildroot}/%{moodlerootdir}lang/ +pushd $RPM_BUILD_ROOT%{moodlerootdir}/lang 1>/dev/null +for lang in $RPM_BUILD_ROOT%{moodlerootdir}/lang/*.zip; do unzip -u -o $lang rm $lang done popd 1>/dev/null # mimetex -pushd $RPM_BUILD_ROOT/%{moodlerootdir}filter/tex/ 1>/dev/null +pushd %{buildroot}/%{moodlerootdir}filter/tex/ 1>/dev/null %{__ln_s} mimetex.linux mimetex popd 1>/dev/null # moodle cronjob -install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/cron-moodle -perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/cron-moodle +install %{SOURCE2} %{buildroot}/%{_sysconfdir}/cron.d/cron-moodle +perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" %{buildroot}/%{_sysconfdir}/cron.d/cron-moodle # moodle_include.conf for apache -install %{SOURCE3} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/ -perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/moodle_include.conf -perl -pi -e "s#MOODLEURL#%{moodleurl}#g" $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/moodle_include.conf -perl -pi -e "s#MOODLEDATADIR#%{moodledatadir}#g" $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/moodle_include.conf +install %{SOURCE3} %{buildroot}/%{apache_sysconfdir}/conf.d/ +perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" %{buildroot}/%{apache_sysconfdir}/conf.d/moodle_include.conf +perl -pi -e "s#MOODLEURL#%{moodleurl}#g" %{buildroot}/%{apache_sysconfdir}/conf.d/moodle_include.conf +perl -pi -e "s#MOODLEDATADIR#%{moodledatadir}#g" %{buildroot}/%{apache_sysconfdir}/conf.d/moodle_include.conf +perl -pi -e "s#MOODLECONFDIR#%{moodleconfigdir}#g" %{buildroot}/%{apache_sysconfdir}/conf.d/moodle_include.conf # config -install %{SOURCE4} $RPM_BUILD_ROOT/%{moodlerootdir}/config.php -install %{SOURCE5} $RPM_BUILD_ROOT/%{moodleconfigdir}/moodle-config.php -perl -pi -e "s#MOODLECONFIGDIR#%{moodleconfigdir}#g" $RPM_BUILD_ROOT/%{moodlerootdir}/config.php -perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" $RPM_BUILD_ROOT/%{moodleconfigdir}/moodle-config.php -perl -pi -e "s#MOODLEDATADIR#%{moodledatadir}#g" $RPM_BUILD_ROOT/%{moodleconfigdir}/moodle-config.php -perl -pi -e "s#MOODLEURL#%{moodleurl}#g" $RPM_BUILD_ROOT/%{moodleconfigdir}/moodle-config.php -perl -pi -e "s#DBHOST#localhost#g" $RPM_BUILD_ROOT/%{moodleconfigdir}/moodle-config.php +install %{SOURCE4} %{buildroot}/%{moodlerootdir}/config.php +install %{SOURCE5} %{buildroot}/%{moodleconfigdir}/moodle-config.php +perl -pi -e "s#MOODLECONFIGDIR#%{moodleconfigdir}#g" %{buildroot}/%{moodlerootdir}/config.php +perl -pi -e "s#MOODLEROOTDIR#%{moodlerootdir}#g" %{buildroot}/%{moodleconfigdir}/moodle-config.php +perl -pi -e "s#MOODLEDATADIR#%{moodledatadir}#g" %{buildroot}/%{moodleconfigdir}/moodle-config.php +perl -pi -e "s#MOODLEURL#%{moodleurl}#g" %{buildroot}/%{moodleconfigdir}/moodle-config.php +perl -pi -e "s#DBHOST#localhost#g" %{buildroot}/%{moodleconfigdir}/moodle-config.php # documentation -%{__mv} $RPM_BUILD_ROOT/%{moodlerootdir}/README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -%{__mv} $RPM_BUILD_ROOT/%{moodlerootdir}/lang/README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/README.lang -%{__mv} $RPM_BUILD_ROOT/%{moodlerootdir}/config-dist.php $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -chmod 644 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/* -%{__mv} $RPM_BUILD_ROOT/%{moodlerootdir}/moodle-oss/* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -rm -rf $RPM_BUILD_ROOT/%{moodlerootdir}/moodle-oss +%{__mv} %{buildroot}/%{moodlerootdir}/README* %{buildroot}/%{_defaultdocdir}/%{name}/ +%{__mv} %{buildroot}/%{moodlerootdir}/lang/README* %{buildroot}/%{_defaultdocdir}/%{name}/README.lang +%{__mv} %{buildroot}/%{moodlerootdir}/config-dist.php %{buildroot}/%{_defaultdocdir}/%{name}/ +chmod 644 %{buildroot}/%{_defaultdocdir}/%{name}/* +%{__mv} %{buildroot}/%{moodlerootdir}/moodle-oss/* %{buildroot}/%{_defaultdocdir}/%{name}/ +rm -rf %{buildroot}/%{moodlerootdir}/moodle-oss # --------------------------------------------------------------------------- +%triggerpostun -- %name < 1.7-6.1 +# Move moodle-config.php to new location and inform the admin about it +cd /etc +if test -e moodle-config.php.rpmnew; then + mv %{moodleconfigdir}/moodle-config.php %{moodleconfigdir}/moodle-config.php.rpmnew + mv /etc/moodle-config.php.rpmnew %{moodleconfigdir}/moodle-config.php + cat > moodle-config.php <<-EOF + # moodle-config.php has moved to /srv/www/inc/ for security reasons + # this file can be removed. + EOF + %restart_on_update apache2 +fi + %post -if [ -f /etc/sysconfig/schoolserver ]; then - # check if we update... - if [ ${1:-0} -gt 1 ]; then +# check if we update... +if [ ${1:-0} -gt 1 ]; then + if [ -f /etc/sysconfig/schoolserver ]; then /bin/bash /usr/share/doc/packages/moodle/./update-moodle.sh - else + fi +else + if [ -f /etc/sysconfig/schoolserver ]; then /bin/bash /usr/share/doc/packages/moodle/./setup-moodle.sh fi fi # --------------------------------------------------------------------------- %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # --------------------------------------------------------------------------- %files @@ -1680,6 +1728,7 @@ %dir %{_defaultdocdir}/%{name} %dir %{moodlerootdir} %dir %{moodlerootdir}/lang +%dir %{moodleconfigdir} %doc %{_defaultdocdir}/%{name}/* %{moodlerootdir}/[a-ce-km-z]* %{moodlerootdir}/lang/en* @@ -1693,6 +1742,18 @@ %{moodledatadir}/* %changelog -n moodle +* Tue Jan 23 2007 - lrupp(a)suse.de +- updated moodle to 1.7.1 (bugfix release) +- updated language packs +- fixed requires for SLES9 +- added triggerpostun for old config move +- added 'de_du' package +* Tue Dec 19 2006 - lrupp(a)suse.de +- some enhancements in the moodle-add-user script +- changed default currency to "EUR" instead of "USD" in the database +* Thu Dec 07 2006 - lrupp(a)suse.de +- Updated ca, en, es, eu, fr, ja, ko, tr and vi language files +- updated setup and plugin script in moodle-oss.tar.bz2 * Fri Nov 17 2006 - lrupp(a)suse.de - updated translations - beautify specfile ++++++ af_utf8.zip ++++++ Files moodle/af_utf8.zip and /mounts/work_src_done/NOARCH/moodle/af_utf8.zip differ ++++++ ar_utf8.zip ++++++ Files moodle/ar_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ar_utf8.zip differ ++++++ be_utf8.zip ++++++ Files moodle/be_utf8.zip and /mounts/work_src_done/NOARCH/moodle/be_utf8.zip differ ++++++ bg_utf8.zip ++++++ Files moodle/bg_utf8.zip and /mounts/work_src_done/NOARCH/moodle/bg_utf8.zip differ ++++++ bs_utf8.zip ++++++ Files moodle/bs_utf8.zip and /mounts/work_src_done/NOARCH/moodle/bs_utf8.zip differ ++++++ ca_utf8.zip ++++++ Files moodle/ca_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ca_utf8.zip differ ++++++ cs_utf8.zip ++++++ Files moodle/cs_utf8.zip and /mounts/work_src_done/NOARCH/moodle/cs_utf8.zip differ ++++++ da_utf8.zip ++++++ Files moodle/da_utf8.zip and /mounts/work_src_done/NOARCH/moodle/da_utf8.zip differ ++++++ de_utf8.zip ++++++ Files moodle/de_utf8.zip and /mounts/work_src_done/NOARCH/moodle/de_utf8.zip differ ++++++ el_utf8.zip ++++++ Files moodle/el_utf8.zip and /mounts/work_src_done/NOARCH/moodle/el_utf8.zip differ ++++++ en_utf8.zip ++++++ Files moodle/en_utf8.zip and /mounts/work_src_done/NOARCH/moodle/en_utf8.zip differ ++++++ es_utf8.zip ++++++ Files moodle/es_utf8.zip and /mounts/work_src_done/NOARCH/moodle/es_utf8.zip differ ++++++ et_utf8.zip ++++++ Files moodle/et_utf8.zip and /mounts/work_src_done/NOARCH/moodle/et_utf8.zip differ ++++++ eu_utf8.zip ++++++ Files moodle/eu_utf8.zip and /mounts/work_src_done/NOARCH/moodle/eu_utf8.zip differ ++++++ fi_utf8.zip ++++++ Files moodle/fi_utf8.zip and /mounts/work_src_done/NOARCH/moodle/fi_utf8.zip differ ++++++ fr_utf8.zip ++++++ Files moodle/fr_utf8.zip and /mounts/work_src_done/NOARCH/moodle/fr_utf8.zip differ ++++++ ga_utf8.zip ++++++ Files moodle/ga_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ga_utf8.zip differ ++++++ gl_utf8.zip ++++++ Files moodle/gl_utf8.zip and /mounts/work_src_done/NOARCH/moodle/gl_utf8.zip differ ++++++ hi_utf8.zip ++++++ Files moodle/hi_utf8.zip and /mounts/work_src_done/NOARCH/moodle/hi_utf8.zip differ ++++++ hu_utf8.zip ++++++ Files moodle/hu_utf8.zip and /mounts/work_src_done/NOARCH/moodle/hu_utf8.zip differ ++++++ id_utf8.zip ++++++ Files moodle/id_utf8.zip and /mounts/work_src_done/NOARCH/moodle/id_utf8.zip differ ++++++ is_utf8.zip ++++++ Files moodle/is_utf8.zip and /mounts/work_src_done/NOARCH/moodle/is_utf8.zip differ ++++++ it_utf8.zip ++++++ Files moodle/it_utf8.zip and /mounts/work_src_done/NOARCH/moodle/it_utf8.zip differ ++++++ ja_utf8.zip ++++++ Files moodle/ja_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ja_utf8.zip differ ++++++ ka_utf8.zip ++++++ Files moodle/ka_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ka_utf8.zip differ ++++++ ko_utf8.zip ++++++ Files moodle/ko_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ko_utf8.zip differ ++++++ lt_utf8.zip ++++++ Files moodle/lt_utf8.zip and /mounts/work_src_done/NOARCH/moodle/lt_utf8.zip differ ++++++ lv_utf8.zip ++++++ Files moodle/lv_utf8.zip and /mounts/work_src_done/NOARCH/moodle/lv_utf8.zip differ ++++++ moodle-1.7.tar.bz2 -> moodle-1.7.1.tar.bz2 ++++++ moodle/moodle-1.7.tar.bz2 /mounts/work_src_done/NOARCH/moodle/moodle-1.7.1.tar.bz2 differ: byte 11, line 1 ++++++ moodle-config.php ++++++ --- moodle/moodle-config.php 2006-11-14 16:55:50.000000000 +0100 +++ /mounts/work_src_done/NOARCH/moodle/moodle-config.php 2006-11-28 18:05:03.000000000 +0100 @@ -1,4 +1,4 @@ -<?PHP // $Id: moodle-config.php,v 1.1 2006/07/26 21:24:11 lrupp Exp $ +<?PHP // $Id: moodle-config.php,v 1.5 2006/11/17 01:50:58 lrupp Exp $ /////////////////////////////////////////////////////////////////////////// // // // Moodle configuration file // ++++++ moodle_include.conf ++++++ --- moodle/moodle_include.conf 2006-11-06 14:14:15.000000000 +0100 +++ /mounts/work_src_done/NOARCH/moodle/moodle_include.conf 2007-01-31 08:31:17.000000000 +0100 @@ -1,8 +1,9 @@ -# Example configuration for Moodle +# +# Configuration for Moodle # UseCanonicalName On -Alias /moodle/ "MOODLEROOTDIR" +Alias /moodle "MOODLEROOTDIR" <Directory MOODLEROOTDIR> Options None @@ -33,10 +34,10 @@ # Max. file sizes to transfer via Moodle Webfrontend php_value upload_max_filesize 10M php_value post_max_size 10M - php_value memory_limit "16M" + php_value memory_limit "32M" # improved security - php_admin_value open_basedir "MOODLEDATADIR:MOODLEROOTDIR:/tmp" + php_admin_value open_basedir "MOODLEDATADIR:MOODLEROOTDIR:/tmp:MOODLECONFDIR" </IfModule> @@ -59,10 +60,10 @@ # Max. file sizes to transfer via Moodle Webfrontend php_value upload_max_filesize 10M php_value post_max_size 10M - php_value memory_limit "16M" + php_value memory_limit "32M" # improved security - php_admin_value open_basedir "MOODLEDATADIR:MOODLEROOTDIR:/tmp" + php_admin_value open_basedir "MOODLEDATADIR:MOODLEROOTDIR:/tmp:MOODLECONFDIR" </IfModule> ++++++ moodle-oss.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/moodle-add-user new/moodle-oss/moodle-add-user --- old/moodle-oss/moodle-add-user 2006-09-24 22:55:48.000000000 +0200 +++ new/moodle-oss/moodle-add-user 2007-01-08 19:11:15.000000000 +0100 @@ -1,19 +1,31 @@ #!/usr/bin/perl - -# Module Laden +# +# $Id: moodle-add-user,v 1.8 2006/12/19 19:10:35 lrupp Exp $ +# $Log: moodle-add-user,v $ +# Revision 1.8 2006/12/19 19:10:35 lrupp +# - added row definitions so we know what we are doing ;-) +# - deleted oss dependency - not necessary if we get all what we need via commandline +# - prepared first statement for adding a course automatically (not finished yet) +# +# Revision 1.7 2006/12/07 17:55:08 pv +# now it works, it inserts into the table, but I do not know it works fine, +# becouse 2 field was missed :-( +# +# Revision 1.5 2006/12/06 22:58:48 lrupp +# some enhancements +# +# Revision 1.4 2006/11/28 15:52:23 lrupp +# use new directory structure +# +# use strict; -#use Getopt::Long; use DBI; +use Config::IniFiles; -my ($uid, $uidNum, $dn); - -# Parameter mit GetOpt einlesen -# -#GetOptions( -# "uid=s" => \$uid, -# "uidnumber=i" => \$uidNum, -# "dn=s" => \$dn, -#); +my ($uid, $uidnum, $dn, $role); +my $dbname = "moodle"; +my $pwfile = "/root/.my.cnf"; +my %attributes; #Parameter von STDIN lesen while(<STDIN>) @@ -21,61 +33,95 @@ my ( $key, $value ) = split / /,$_,2; chomp $value; + + if( !$value ) + { + chomp $key; + if( $key =~ /^uid=.*/i ) + { + $dn = $key; + } + } if( $key =~ /^uid$/i ) - { + { $uid = $value; } elsif ( $key =~ /^uidnumber$/i) { - $uidNum = $value; + $uidnum = $value; + } + elsif ( $key =~ /^role$/i) + { + $role = $value; + } + elsif ( $key =~ /preferredlanguage$/i ) + { + $attributes{'preferredlanguage'}=$value; + } + elsif ( $key =~ /gidnumber$/i) + { + $attributes{'gidnumber'}=$value; + } + elsif ( $key =~ /givenname$/) + { + $attributes{'givenname'} = $value; + } + elsif ( $key =~ /sn$/) + { + $attributes{'sn'} = $value; + } + elsif ( $key =~ /mail$/) + { + $attributes{'mail'} = $value; + } elsif ( $key =~ /$/) + { + $attributes{'CITY'} = $value; } } -# Falls uid,dn nicht gegeben, aus LDAP einlesen -if ( $uid =~ /^$/ ){ - chomp($uid = (`ldapsearch -x '(&(uidnumber=$uidNum)(objectclass=SchoolAccount))' | grep uid:`)); $uid =~ s/^.*\s//g; -} -if ( $dn =~ /^$/ ){ - chomp($dn = (`ldapsearch -x '(&(uidnumber=$uidNum)(objectclass=SchoolAccount))' | grep dn:`)); $dn =~ s/^.*\s//g; +if( $role ne 'teachers' ) +{ + exit 1; } -# Gruppenzugeh�rigkeit einlesen -chomp( my $gidNum = (`ldapsearch -x uidnumber=$uidNum | grep gidNumber`)); $gidNum =~ s/^.*\s//g; +my $ini = new Config::IniFiles( -file => "$pwfile" ); +my $dbpw = $ini->val('client','password'); +my $dbuser = $ini->val('client','user'); +my $dbhost = $ini->val('client','host'); + +# Querys definieren +my $q_sel = "SELECT username FROM mdl_user WHERE username='$uid';"; +my $q_mod = "UPDATE mdl_user SET username = '$uid', WHERE username='$uid';"; +my $q_add = "INSERT INTO mdl_user ('id','auth','confirmed','policyagreed','deleted','username','firstname','lastname','email','emailstop','country','lang','timezone') VALUES ($uidnum,'ldap',1,0,0,'$uid','$attributes{givenname}','$attributes{sn}','$attributes{mail}',0,'$attributes{preferredlanguage}','".lc($attributes{preferredlanguage})."','99');"; +my $q_add2= "INSERT INTO mdl_user_preferences ('userid','name','value') VALUES ($uidnum,'email_send_count','1');"; +# using category 1 as default - TODO: create a new category named "teacher courses" ? +my $q_addcourse1="INSERT INTO mdl_course ('category','fullname','shortname','summary','format','modinfo') VALUES ('1','$attributes{sn} course','$attributes{sn} course','Teacher course of $attributes{sn}','site','a:1:{i:1;O:8:\"stdClass\":6:{s:2:\"cm\";i:1;s:3:\"mod\";s:5:\"forum\";s:7:\"section\";s:1:\"0\";s:4:\"name\";s:23:\"$attributes{sn}+Course\";s:7:\"visible\";s:1:\"1\";s:5:\"extra\";s:0:\"\";}}','' );"; + +open OUT, ">/tmp/mysql"; +print OUT $q_add."\n".$q_add2; +close OUT; +# Datenbank-Verbindung aufbauen +my $dbh = DBI->connect( 'dbi:mysql:'.$dbname, $dbuser, $dbpw ) + || die "Kann keine Verbindung zum MySQL-Server aufbauen: $DBI::errstr\n"; -if ($gidNum eq '502') # ist ein Lehrer -{ - # Datenbankname setzen - my $dbname = "moodle"; +# Ist der benutzer vorhanden? +my $sth = $dbh->prepare($q_sel); $sth->execute(); - # Querys definieren - my $q_sel = "SELECT username FROM mdl_user WHERE username='$uid'"; - my $q_mod = "UPDATE mdl_user SET username = '$uid' , teacher_dn = '$dn' WHERE username='$uid'"; - my $q_add = "INSERT INTO mdl_user VALUES ($uidNum,'ldap',1,0,0,'$uid','','','ADMIN_FIRST_NAME','ADMIN_LAST_NAME','$uid@DOMAIN',0,'','','','','','','','','','','CITY','LANG','lang_lowercase','','99',0,1153772453,0,0,'SCHOOL_MAILSERVER','',0,'','',0,2,2,0,1,1,1153769462)"; - - # Datenbank-Verbindung aufbauen - my $dbh = DBI->connect( 'dbi:mysql:'.$dbname, 'root', '') - || die "Kann keine Verbindung zum MySQL-Server aufbauen: $DBI::errstr\n"; - - # Ist der benutzer vorhanden? - my $sth = $dbh->prepare($q_sel); $sth->execute(); - - if ( $sth->fetchrow_array() ne '') - { - # Ja, modifizieren - $sth->finish(); $sth = $dbh->prepare($q_mod); $sth->execute(); - } else { - # Nein, neu anlegen - $sth->finish(); $sth = $dbh->prepare($q_add); $sth->execute(); - } - - # Abfragehandle freigeben - $sth->finish(); - # Datenbank-Verbindung beenden - $dbh->disconnect; - exit 1; -} -else +if ( $sth->fetchrow_array() ne '') { - exit 0; + # user do exist, we modify it only + $sth->finish(); + $sth = $dbh->prepare($q_mod); + $sth->execute(); +} else { + # this is a new user + $sth->finish(); + $sth = $dbh->prepare($q_add); + $sth->execute(); + $sth = $dbh->prepare($q_add2); + $sth->execute(); } + +$dbh->disconnect; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/moodle-database.sql new/moodle-oss/moodle-database.sql --- old/moodle-oss/moodle-database.sql 2006-11-17 04:22:10.000000000 +0100 +++ new/moodle-oss/moodle-database.sql 2007-01-08 19:11:15.000000000 +0100 @@ -1302,7 +1302,7 @@ `lang` varchar(10) collate utf8_unicode_ci NOT NULL default '', `theme` varchar(50) collate utf8_unicode_ci NOT NULL default '', `cost` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `currency` varchar(3) collate utf8_unicode_ci NOT NULL default 'USD', + `currency` varchar(3) collate utf8_unicode_ci NOT NULL default 'EUR', `timecreated` bigint(10) unsigned NOT NULL default '0', `timemodified` bigint(10) unsigned NOT NULL default '0', `metacourse` tinyint(1) unsigned NOT NULL default '0', @@ -1329,7 +1329,7 @@ /*!40000 ALTER TABLE `mdl_course` DISABLE KEYS */; LOCK TABLES `mdl_course` WRITE; -INSERT INTO `mdl_course` VALUES (1,0,1000,'','SCHOOLNAME Moodle','Moodle','','SCHOOLNAME Moodle','site',1,'a:1:{i:1;O:8:\"stdClass\":6:{s:2:\"cm\";i:1;s:3:\"mod\";s:5:\"forum\";s:7:\"section\";s:1:\"0\";s:4:\"name\";s:23:\"Nachrichten+der+Website\";s:7:\"visible\";s:1:\"1\";s:5:\"extra\";s:0:\"\";}}',3,'Trainer/in','Trainer/innen','Teilnehmer/in','Teilnehmer/innen',0,0,0,0,0,0,0,1,0,0,0,'','','','USD',0,1163730132,0,0,0,0,0,0,1,0,0,'',0); +INSERT INTO `mdl_course` VALUES (1,0,1000,'','SCHOOLNAME Moodle','Moodle','','SCHOOLNAME Moodle','site',1,'a:1:{i:1;O:8:\"stdClass\":6:{s:2:\"cm\";i:1;s:3:\"mod\";s:5:\"forum\";s:7:\"section\";s:1:\"0\";s:4:\"name\";s:23:\"Nachrichten+der+Website\";s:7:\"visible\";s:1:\"1\";s:5:\"extra\";s:0:\"\";}}',3,'Trainer/in','Trainer/innen','Teilnehmer/in','Teilnehmer/innen',0,0,0,0,0,0,0,1,0,0,0,'','','','EUR',0,1163730132,0,0,0,0,0,0,1,0,0,'',0); UNLOCK TABLES; /*!40000 ALTER TABLE `mdl_course` ENABLE KEYS */; @@ -1730,7 +1730,7 @@ `timecreated` bigint(10) unsigned NOT NULL default '0', `settletime` bigint(10) unsigned NOT NULL default '0', `amount` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `currency` varchar(3) collate utf8_unicode_ci NOT NULL default 'USD', + `currency` varchar(3) collate utf8_unicode_ci NOT NULL default 'EUR', PRIMARY KEY (`id`), KEY `mdl_enroauth_cou_ix` (`courseid`), KEY `mdl_enroauth_use_ix` (`userid`), @@ -5656,7 +5656,7 @@ /*!40000 ALTER TABLE `mdl_user` DISABLE KEYS */; LOCK TABLES `mdl_user` WRITE; INSERT INTO `mdl_user` VALUES (1,'manual',1,0,0,'guest','084e0343a0486ff05530df6c705c8bb4','','Gast',' ','admin@DOMAIN',0,'','','','','','','','','','','','','admin_lang_lowercase','','99',0,0,0,0,'','',0,'','Dieser Nutzer hat nur Lesezugriff auf Kurse, die Gäste zulassen.',1,0,2,1,1,1,0,1163729425,0), -(2,'manual',1,0,0,'admin','MD5PASSWORD','','Administration','Nutzer/in','admin@DOMAIN',0,'','','','','','','','','','','CITY','ADMIN_LANG','admin_lang_lowercase','','99',0,1163733172,0,1163730667,'172.16.0.3','',0,'','',0,1,1,0,1,1,1,1163729629,0); +(2,'manual',1,0,0,'admin','MD5PASSWORD','','ADMIN_FIRST_NAME','ADMIN_LAST_NAME','admin@DOMAIN',0,'','','','','','','','','','','CITY','ADMIN_LANG','admin_lang_lowercase','','99',0,1163733172,0,1163730667,'172.16.0.3','',0,'','',0,1,1,0,1,1,1,1163729629,0); UNLOCK TABLES; /*!40000 ALTER TABLE `mdl_user` ENABLE KEYS */; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/moodle-del-user new/moodle-oss/moodle-del-user --- old/moodle-oss/moodle-del-user 2006-09-24 22:55:48.000000000 +0200 +++ new/moodle-oss/moodle-del-user 2006-11-27 22:32:17.000000000 +0100 @@ -1,20 +1,13 @@ #!/usr/bin/perl - +# +# +# # Module Laden use strict; -#use Getopt::Long; use DBI; my ($uid, $uidNum, $dn); -# Parameter mit GetOpt einlesen -# -#GetOptions( -# "uid=s" => \$uid, -# "uidnumber=i" => \$uidNum, -# "dn=s" => \$dn, -#); - #Parameter von STDIN lesen while(<STDIN>) { @@ -50,37 +43,10 @@ my $dbh = DBI->connect( 'dbi:mysql:'.$dbname, 'root', '') || die "Kann keine Verbindung zum MySQL-Server aufbauen: $DBI::errstr\n"; - # Benutzer-Lernboxen abfragen my $sth1 = $dbh->prepare($q_sel); $sth1->execute(); - while ( @box_id = $sth1->fetchrow_array() ) - { - # L�schqueries pro Lernbox definieren - my $q_del_kbt = "DELETE FROM kjs_box_teacher WHERE box_id = '$box_id[0]'"; - my $q_del_kw = "DELETE FROM kjs_when WHERE box_id = '$box_id[0]'"; - my $q_del_kl = "DELETE FROM kjs_links WHERE box_id = '$box_id[0]'"; - my $q_del_kt = "DELETE FROM kjs_tasks WHERE box_id = '$box_id[0]'"; - my $q_del_kzbu = "DELETE FROM kjs_zuo_box_urlchecker WHERE box_id = '$box_id[0]'"; - my $q_del_kzbm = "DELETE FROM kjs_zuo_box_mediatype WHERE box_id = '$box_id[0]'"; - my $q_del_kzbw = "DELETE FROM kjs_zuo_box_workstation WHERE box_id = '$box_id[0]'"; - my $q_del_kzbut = "DELETE FROM kjs_zuo_box_user_teacher WHERE box_id = '$box_id[0]'"; - - # L�schqueries pro Lernbox absetzen - my $sth2 = $dbh->prepare($q_del_kbt); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kw); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kl); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kt); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kzbu); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kzbm); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kzbw); $sth2->execute(); $sth2->finish(); $sth2 = undef; - $sth2 = $dbh->prepare($q_del_kzbut); $sth2->execute(); $sth2->finish(); $sth2 = undef; - } - # L�schquery Benutzereintrag - my $sth3 = $dbh->prepare($q_del_kut); $sth3->execute(); $sth3->finish(); $sth3 = undef; - # Abfragehandle freigeben $sth1->finish(); - # Datenbank-Verbindung beenden $dbh->disconnect; @@ -89,4 +55,4 @@ else { exit 0; -} \ No newline at end of file +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/setup-moodle.sh new/moodle-oss/setup-moodle.sh --- old/moodle-oss/setup-moodle.sh 2006-11-17 04:37:17.000000000 +0100 +++ new/moodle-oss/setup-moodle.sh 2007-01-22 08:28:43.000000000 +0100 @@ -7,12 +7,28 @@ INCDIR=/etc ROOTDIR=/srv/www/htdocs/moodle DATADIR=/srv/www/moodledata -LOGFILE=/var/log/`basename $0`.log +LINKDIR=/srv/www/oss +LOGFILE=/var/log/moodle-setup.log +VERBOSE="no" ########################################################################### # Warning: don't change anything below this line ########################################################################### +function LOG() { + LOG_DATE=`date "+%b %d %H:%M:%S"` + HOST=`hostname` + echo "$LOG_DATE $HOST setup: $1" >> $LOGFILE + if [ "$VERBOSE" = "yes" ]; then + echo $1 + fi +} + +if [ ! -f /etc/sysconfig/schoolserver ]; then + echo "This is no OSS!" + exit 1 +fi + PATH=$PATH:/sbin:/usr/sbin:/bin MYROOT="/usr/share/doc/packages/moodle" CHAT_SERVERHOST="schoolserver" @@ -44,11 +60,6 @@ # checks... ########################################################################### -if [ ! -f /etc/sysconfig/schoolserver ]; then - echo "This is no OSS!" - exit 1 -fi - . /etc/sysconfig/schoolserver # check if we are using the correct server: @@ -62,73 +73,83 @@ ########################################################################### # start installation ########################################################################### +test -d $DATADIR || mkdir -p $DATADIR/{1,2,backup,cache,quarantine,sessions,temp,users} cd $DATADIR -echo "`basename $0` started: `date`" >> $LOGFILE -echo "---- Setting global permissions of $DATADIR" >> $LOGFILE -chown -R wwwrun $DATADIR 2>>$LOGFILE +LOG "`basename $0` started" +LOG "Setting global permissions of $DATADIR" +chown -R wwwrun:www $DATADIR 2>>$LOGFILE # check if we can use ACLs... DEVICE=`df -h $DATADIR | tail -n 1 | awk '{ print $1 }'` WITH_ACL=`mount | grep $DEVICE | grep -q acl ; echo $?` if [ $WITH_ACL -eq 0 ] ; then - echo "---- Setting default ACLs for $DATADIR" >> $LOGFILE + LOG "Setting default ACLs for $DATADIR" >> $LOGFILE setfacl -m u:wwwrun:--x /home/software 2>>$LOGFILE setfacl -R -m g:teachers:--- $DATADIR/* 2>>$LOGFILE setfacl -R -m g:students:--- $DATADIR/* 2>>$LOGFILE setfacl -R -m d:g:teachers:r-x $DATADIR/1 2>>$LOGFILE setfacl -R -m d:g:students:r-x $DATADIR/2 2>>$LOGFILE else - echo "**** WARNING: NO ACL SUPPORT FOR $DATADIR DETECTED!" >>$LOGFILE + LOG "WARNING: NO ACL SUPPORT FOR $DATADIR DETECTED!" fi cd $MYROOT ################################### -# the plugins +# start mysql database if necessary ################################### +if [ `/etc/init.d/mysql status >/dev/null; echo $?`x != "0"x ]; then + /sbin/insserv mysql + /etc/init.d/mysql start +fi -test -d /usr/share/oss/plugins/add_user || mkdir -p /usr/share/oss/plugins/add_user -test -d /usr/share/oss/plugins/del_user || mkdir -p /usr/share/oss/plugins/del_user -cp -b $MYROOT/moodle-add-user /usr/share/oss/plugins/add_user/ -cp -b $MYROOT/moodle-del-user /usr/share/oss/plugins/del_user/ +################################### +# the plugins +################################### +#test -d /usr/share/oss/plugins/add_user || mkdir -p /usr/share/oss/plugins/add_user +#test -d /usr/share/oss/plugins/del_user || mkdir -p /usr/share/oss/plugins/del_user +#cp -b $MYROOT/moodle-add-user /usr/share/oss/plugins/add_user/ +#cp -b $MYROOT/moodle-del-user /usr/share/oss/plugins/del_user/ +#chown root:root /usr/share/oss/plugins/del_user/moodle-del-user +#chown root:root /usr/share/oss/plugins/add_user/moodle-add-user +#chmod 750 /usr/share/oss/plugins/del_user/moodle-del-user +#chmod 750 /usr/share/oss/plugins/add_user/moodle-add-user ################################### # the moodle-config.php file ################################### -echo "---- Creating new $INCDIR/moodle-config.php" >>$LOGFILE +LOG "Creating new $INCDIR/moodle-config.php" if [ -f $INCDIR/moodle-config.php.backup ]; then - echo "**** ERROR: $INCDIR/moodle-config.php.backup exists!" >>$LOGFILE - echo "**** Leaving old $INCDIR/moodle-config.php.backup" >>$LOGFILE - echo "**** Deleting $INCDIR/moodle-config.php file instead" >>$LOGFILE - rm $INCDIR/moodle-config.php + LOG "ERROR: $INCDIR/moodle-config.php.backup exists!" + LOG "Leaving old $INCDIR/moodle-config.php.backup" + LOG "Deleting $INCDIR/moodle-config.php file instead" + rm $INCDIR/moodle-config.php 2>/dev/null + cp $INCDIR/moodle-config.php.backup $INCDIR/moodle-config.php else - mv $INCDIR/moodle-config.php $INCDIR/moodle-config.php.backup + cp $INCDIR/moodle-config.php $INCDIR/moodle-config.php.backup fi - -# copy template -cp $MYROOT/moodle-config.php $INCDIR/moodle-config.php 2>>$LOGFILE chown wwwrun:root $INCDIR/moodle-config.php 2>>$LOGFILE chmod 460 $INCDIR/moodle-config.php 2>>$LOGFILE # adapt template to the running system -INTERNURL="http://schulserver.$SCHOOL_DOMAIN/moodle" +INTERNURL="https://schoolserver.$SCHOOL_DOMAIN/moodle" perl -pi -e "s#DBHOST#$DBHOST#g" $INCDIR/moodle-config.php 2>>$LOGFILE perl -pi -e "s#PASSWD#$PASS#g" $INCDIR/moodle-config.php 2>>$LOGFILE perl -pi -e "s#WWWROOT#$INTERNURL#g" $INCDIR/moodle-config.php 2>>$LOGFILE perl -pi -e "s#ROOTDIR#$ROOTDIR#g" $INCDIR/moodle-config.php 2>>$LOGFILE perl -pi -e "s#DATADIR#$DATADIR#g" $INCDIR/moodle-config.php 2>>$LOGFILE perl -pi -e "s#SCHOOL_DOMAIN#$SCHOOL_DOMAIN#g" $INCDIR/moodle-config.php 2>>$LOGFILE -perl -pi -e "s#http://localhost/moodle/#$INTERNURL#g" $INCDIR/moodle-config.php 2>>$LOGFILE +perl -pi -e "s#http://localhost/moodle#$INTERNURL#g" $INCDIR/moodle-config.php 2>>$LOGFILE # try to prepare for use of dyndns (moodle via masquerading) DYNDNSURL=`grep -v \# /etc/ddclient.conf | grep -v \\ | perl -pe 's/^\s+$//g'` if [ "$DYNDNSURL" == "" ]; then - EXTERNURL="http://schulserver.$SCHOOL_DOMAIN/moodle/" + EXTERNURL="http://schulserver.$SCHOOL_DOMAIN/moodle" else - EXTERNURL="https://$DYNDNSURL/moodle/" + EXTERNURL="https://$DYNDNSURL/moodle" fi SUBNET=`echo ${SCHOOL_MAILSERVER%\.*\.*}` perl -pi -e "s#INTERNURL#$INTERNURL#g" $INCDIR/moodle-config.php 2>>$LOGFILE @@ -142,6 +163,7 @@ # /etc/apache2/mod_log_config.conf MOD_LOG_FILE="/etc/apache2/mod_log_config.conf" if [ `grep -q moodleformat $MOD_LOG_FILE; echo $?` -eq 1 ] ; then +LOG "Adding Logfile format to $MOD_LOG_FILE" cat >> $MOD_LOG_FILE <<-EOF # To allow a better report status of moodle actions the following line is added for moodleformat @@ -149,35 +171,20 @@ EOF else - echo "**** WARNING: Logformat for moodle exists in $MOD_LOG_FILE - skipping" >> $LOGFILE + LOG "WARNING: Logformat for moodle exists in $MOD_LOG_FILE - skipping" fi -# /etc/apache2/vhosts.d/schoolserver_include.conf -INCLUDE=`grep moodle_include.conf /etc/apache2/vhosts.d/schoolserver_include.conf` -if [ "$INCLUDE" == "" ]; then - echo "---- Adapting /etc/apache2/vhosts.d/schoolserver_include.conf" >>$LOGFILE - perl -pi -e "s# ServerName schoolserver\n# ServerName schoolserver\n\n Include /etc/apache2/conf.d/moodle_include.conf\n#" /etc/apache2/vhosts.d/schoolserver_include.conf 2>>$LOGFILE +# /etc/apache2/vhosts.d/oss/moodle_include.conf +if [ ! -f /etc/apache2/vhosts.d/oss/moodle_include.conf ]; then + LOG "Preparing apache2 directory" + cp /etc/apache2/conf.d/moodle_include.conf /etc/apache2/vhosts.d/oss/ 2>>$LOGFILE + mv /etc/apache2/conf.d/moodle_include.conf /etc/apache2/vhosts.d/oss-ssl/ 2>>$LOGFILE else - echo "**** WARNING: moodle_include.conf is already included in /etc/apache2/vhosts.d/schoolserver_include.conf" >> $LOGFILE + LOG "WARNING: moodle_include.conf is already included in /etc/apache2/vhosts.d/oss*/" fi -# /etc/apache2/conf.d/moodle_include.conf -MOODLE_INCLUDE_CONF="/etc/apache2/conf.d/moodle_include.conf" -echo "---- Creating new /etc/apache2/moodle_include.conf" >> $LOGFILE -if [ -f $MOODLE_INCLUDE_CONF.backup ]; then - echo "**** ERROR: $MOODLE_INCLUDE_CONF.backup exists!" >>$LOGFILE - echo "**** Leaving old $MOODLE_INCLUDE_CONF.backup" >>$LOGFILE - echo "**** Deleting $MOODLE_INCLUDE_CONF file instead" >>$LOGFILE - test -f $MOODLE_INCLUDE_CONF && rm $MOODLE_INCLUDE_CONF -else - test -f $MOODLE_INCLUDE_CONF && mv $MOODLE_INCLUDE_CONF $MOODLE_INCLUDE_CONF.backup -fi - -cp $MYROOT/moodle_include.conf /etc/apache2/ 2>>$LOGFILE -chown root:root /etc/apache2/moodle_include.conf 2>>$LOGFILE -chmod 644 /etc/apache2/moodle_include.conf 2>>$LOGFILE - -perl -pi -e "s#ROOTDIR#$ROOTDIR#" /etc/apache2/moodle_include.conf 2>>$LOGFILE +perl -pi -e "s#ROOTDIR#$ROOTDIR#" /etc/apache2/vhosts.d/oss-ssl/moodle_include.conf 2>>$LOGFILE +perl -pi -e "s#ROOTDIR#$ROOTDIR#" /etc/apache2/vhosts.d/oss/moodle_include.conf 2>>$LOGFILE ################################### @@ -185,14 +192,14 @@ ################################### if [ `echo "show databases;" | mysql -u root | grep -q moodle; echo $?` -ne 0 ] ; then - echo "---- Creating Database" >>$LOGFILE + LOG "Creating Database" mysqladmin -u root CREATE moodle; echo "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,ALTER ON moodle.* TO moodleuser@localhost IDENTIFIED BY '$PASS';" \ | mysql -u root 2>>$LOGFILE echo "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,ALTER ON moodle.* TO moodleuser@$SCHOOL_DOMAIN IDENTIFIED BY '$PASS';" \ | mysql -u root 2>>$LOGFILE - MD5PASSWORD=`$MYROOT/./create-password.php $ADMINPASS` + MD5PASSWORD=`/usr/bin/php $MYROOT/create-password.php $ADMINPASS` # adapt moodle-inserts.sql to local settings cp $MYROOT/moodle-database.sql $MYROOT/moodle-inserts.sql.in 2>>$LOGFILE @@ -218,14 +225,22 @@ mysql -u root moodle < $MYROOT/moodle-inserts.sql.in 2>>$LOGFILE rm $MYROOT/moodle-inserts.sql.in 2>>$LOGFILE else - echo "**** WARNING: Database \"moodle\" exists - skipping" >>$LOGFILE + LOG "WARNING: Database \"moodle\" exists - skipping" +fi + +################################### +# prepare directory for OSS homepage +################################### +if [ ! -L $LINKDIR/moodle ]; then + LOG "Creating Symlink to $LINKDIR/moodle" + pushd $LINKDIR 1>/dev/null 2>>$LOGFILE + ln -s $ROOTDIR moodle + popd 1>/dev/null 2>>$LOGFILE fi ########################################################################### # finished ########################################################################### -rm $PASS -echo "`basename $0` finished: `date`" >> $LOGFILE - -rcapache2 restart - +rm -f $PASS +LOG "setup-moodle finished" +rcapache2 restart 1>/dev/null 2>>$LOGFILE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/uninstall-moodle.sh new/moodle-oss/uninstall-moodle.sh --- old/moodle-oss/uninstall-moodle.sh 2006-07-28 00:43:33.000000000 +0200 +++ new/moodle-oss/uninstall-moodle.sh 2006-11-27 18:43:44.000000000 +0100 @@ -7,11 +7,26 @@ INCDIR=/etc ROOTDIR=/srv/www/htdocs/moodle DATADIR=/srv/www/moodledata -LOGFILE=/var/log/`basename $0`.log +LINKDIR=/srv/www/oss +LOGFILE=/var/log/setup-moodle.log +VERBOSE="no" ########################################################################### # Warning: don't change anything below this line ########################################################################### +function LOG() { + LOG_DATE=`date "+%b %d %H:%M:%S"` + HOST=`hostname` + echo "$LOG_DATE $HOST uninstall: $1" >> $LOGFILE + if [ "$VERBOSE" = "yes" ]; then + echo $1 + fi +} + +if [ ! -f /etc/sysconfig/schoolserver ]; then + echo "This is no OSS!" + exit 1 +fi PATH=$PATH:/sbin:/usr/sbin:/bin MYROOT=`pwd` @@ -21,11 +36,6 @@ # checks... ########################################################################### -if [ ! -f /etc/sysconfig/schoolserver ]; then - echo "This is no OSS!" - exit 1 -fi - . /etc/sysconfig/schoolserver # check if we are using the correct server: @@ -39,52 +49,50 @@ ########################################################################### # start uninstall ########################################################################### -echo "`basename $0` started: `date`" >> $LOGFILE -echo "---- Removing $DATADIR" >> $LOGFILE +LOG "started" +################################### +# remove the datadir +################################### +LOG "removing $DATADIR" rm -r $DATADIR 2>>$LOGFILE - +################################### +# remove the linkdir +################################### +LOG "removing $LINKDIR/moodle" +rm -r $LINKDIR/moodle 2>>/LOGFILE ################################### # remove the database ################################### - if [ ! `echo "show databases;" | mysql -u root | grep -q moodle; echo $?` -ne 0 ] ; then - echo "---- Removing Database" >>$LOGFILE + LOG "Removing Database" mysqladmin -u root -f DROP moodle 1>/dev/null 2>>$LOGFILE else - echo "**** WARNING: Can't find Database \"moodle\"" >>$LOGFILE + LOG "WARNING: Can't find Database \"moodle\"" fi ################################### # remove apache2 entries ################################### -echo "---- Adapting /etc/apache2/vhosts.d/schoolserver_include.conf" >>$LOGFILE -perl -pi -e "s/(.*)\/etc\/apache2\/moodle_include.conf\n$//g#" /etc/apache2/vhosts.d/schoolserver_include.conf 2>>$LOGFILE +LOG "Removing apache include file" +find /etc/apache2/vhosts.d/ -name "moodle_include.conf" -exec rm -v {} \; >> $LOGFILE 2>&1 MOD_LOG_FILE="/etc/apache2/mod_log_config.conf" +LOG "Removing apache2 logfile config" if [ `grep -q moodleformat $MOD_LOG_FILE; echo $?` -eq 0 ] ; then perl -pi -e "s/(.*)moodleformat\n$//g" $MOD_LOG_FILE else - echo "**** WARNING: Logformat for moodle doesn't exist in $MOD_LOG_FILE - skipping" >> $LOGFILE + LOG "WARNING: Logformat for moodle doesn't exist in $MOD_LOG_FILE - skipping" fi - ################################### # remove config files ################################### -echo "---- Removing /etc/apache2/moodle_include.conf" >>$LOGFILE -MOODLE_INCLUDE_CONF="/etc/apache2/conf.d/moodle_include.conf" -if [ -f $MOODLE_INCLUDE_CONF.backup ]; then - rm $MOODLE_INCLUDE_CONF 2>/dev/null - mv $MOODLE_INCLUDE_CONF.backup $MOODLE_INCLUDE_CONF 2>>$LOGFILE - rm /etc/apache2/moodle_include.conf 2>>$LOGFILE -fi +LOG "Removing /etc/moodle_config.php" rm /etc/moodle-config.php 2>> $LOGFILE - ########################################################################### # finished ########################################################################### -echo "`basename $0` finished: `date`" >> $LOGFILE - -rcapache2 restart +LOG "uninstall-moodle finished" +rcapache2 restart 1>/dev/null 2>>$LOGFILE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/moodle-oss/update-moodle.sh new/moodle-oss/update-moodle.sh --- old/moodle-oss/update-moodle.sh 2006-07-26 23:23:19.000000000 +0200 +++ new/moodle-oss/update-moodle.sh 2007-01-23 01:01:43.000000000 +0100 @@ -7,11 +7,25 @@ INCDIR=/etc ROOTDIR=/srv/www/htdocs/moodle DATADIR=/srv/www/moodledata +LINKDIR=/srv/www/oss LOGFILE=/var/log/`basename $0`.log ########################################################################### # Warning: don't change anything below this line ########################################################################### +function LOG() { + LOG_DATE=`date "+%b %d %H:%M:%S"` + HOST=`hostname` + echo "$LOG_DATE $HOST update: $1" >> $LOGFILE + if [ "$VERBOSE" = "yes" ]; then + echo $1 + fi +} + +if [ ! -f /etc/sysconfig/schoolserver ]; then + echo "This is no OSS!" + exit 1 +fi PATH=$PATH:/sbin:/usr/sbin:/bin MYROOT=`pwd` @@ -42,11 +56,6 @@ # checks... ########################################################################### -if [ ! -f /etc/sysconfig/schoolserver ]; then - echo "This is no OSS!" - exit 1 -fi - . /etc/sysconfig/schoolserver # check if we are using the correct server: @@ -61,8 +70,8 @@ # start installation ########################################################################### cd $DATADIR -echo "`basename $0` started: `date`" >> $LOGFILE -echo "---- Setting global permissions of $DATADIR" >> $LOGFILE +LOG "started" +LOG "Setting global permissions of $DATADIR" chown -R wwwrun $DATADIR 2 >> $LOGFILE # check if we can use ACLs... @@ -77,25 +86,57 @@ setfacl -R -m d:g:teachers:r-x $DATADIR/1 2>>$LOGFILE setfacl -R -m d:g:students:r-x $DATADIR/2 2>>$LOGFILE else - echo "**** WARNING: NO ACL SUPPORT FOR $DATADIR DETECTED!" >>$LOGFILE + LOG "WARNING: NO ACL SUPPORT FOR $DATADIR DETECTED!" fi cd $MYROOT ################################### +# start mysql database if necessary +################################### +if [ `pidof mysqld`x = ""x ]; then + /sbin/insserv mysql + /etc/init.d/mysql start +fi + +################################### +# the plugins +################################### + +test -d /usr/share/oss/plugins/add_user || mkdir -p /usr/share/oss/plugins/add_user +test -d /usr/share/oss/plugins/del_user || mkdir -p /usr/share/oss/plugins/del_user +test -f /usr/share/oss/plugins/add_user/moodle-add-user && rm /usr/share/oss/plugins/add_user/moodle-add-user +test -f /usr/share/oss/plugins/del_user/moodle-del-user && rm /usr/share/oss/plugins/del_user/moodle-del-user +#cp -b $MYROOT/moodle-add-user /usr/share/oss/plugins/add_user/ +#cp -b $MYROOT/moodle-del-user /usr/share/oss/plugins/del_user/ +#chown root:root /usr/share/oss/plugins/del_user/moodle-del-user +#chown root:root /usr/share/oss/plugins/add_user/moodle-add-user +#chmod 750 /usr/share/oss/plugins/del_user/moodle-del-user +#chmod 750 /usr/share/oss/plugins/add_user/moodle-add-user + +################################### # update the database ################################### if [ ! `echo "show databases;" | mysql -u root | grep -q moodle; echo $?` -ne 0 ] ; then - echo "---- Updating Database" >>$LOGFILE + LOG "Updating Database" else - echo "**** WARNING: Can't find Database \"moodle\"" >>$LOGFILE + LOG "WARNING: Can't find Database \"moodle\"" +fi + +################################### +# prepare directory for OSS homepage +################################### +if [ ! -L $LINKDIR/moodle ]; then + LOG "Creating Symlink to $LINKDIR/moodle" + pushd $LINKDIR 1>/dev/null 2>>$LOGFILE + ln -s $ROOTDIR moodle + popd 1>/dev/null 2>>$LOGFILE fi ########################################################################### # finished ########################################################################### -echo "`basename $0` finished: `date`" >> $LOGFILE - -rcapache2 restart +LOG "finished" +rcapache2 restart 1>/dev/null 2>>$LOGFILE ++++++ ms_utf8.zip ++++++ Files moodle/ms_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ms_utf8.zip differ ++++++ nl_utf8.zip ++++++ Files moodle/nl_utf8.zip and /mounts/work_src_done/NOARCH/moodle/nl_utf8.zip differ ++++++ no_utf8.zip ++++++ Files moodle/no_utf8.zip and /mounts/work_src_done/NOARCH/moodle/no_utf8.zip differ ++++++ pl_utf8.zip ++++++ Files moodle/pl_utf8.zip and /mounts/work_src_done/NOARCH/moodle/pl_utf8.zip differ ++++++ pt_utf8.zip ++++++ Files moodle/pt_utf8.zip and /mounts/work_src_done/NOARCH/moodle/pt_utf8.zip differ ++++++ ro_utf8.zip ++++++ Files moodle/ro_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ro_utf8.zip differ ++++++ ru_utf8.zip ++++++ Files moodle/ru_utf8.zip and /mounts/work_src_done/NOARCH/moodle/ru_utf8.zip differ ++++++ sk_utf8.zip ++++++ Files moodle/sk_utf8.zip and /mounts/work_src_done/NOARCH/moodle/sk_utf8.zip differ ++++++ sl_utf8.zip ++++++ Files moodle/sl_utf8.zip and /mounts/work_src_done/NOARCH/moodle/sl_utf8.zip differ ++++++ sq_utf8.zip ++++++ Files moodle/sq_utf8.zip and /mounts/work_src_done/NOARCH/moodle/sq_utf8.zip differ ++++++ sv_utf8.zip ++++++ Files moodle/sv_utf8.zip and /mounts/work_src_done/NOARCH/moodle/sv_utf8.zip differ ++++++ th_utf8.zip ++++++ Files moodle/th_utf8.zip and /mounts/work_src_done/NOARCH/moodle/th_utf8.zip differ ++++++ tl_utf8.zip ++++++ Files moodle/tl_utf8.zip and /mounts/work_src_done/NOARCH/moodle/tl_utf8.zip differ ++++++ tr_utf8.zip ++++++ Files moodle/tr_utf8.zip and /mounts/work_src_done/NOARCH/moodle/tr_utf8.zip differ ++++++ uk_utf8.zip ++++++ Files moodle/uk_utf8.zip and /mounts/work_src_done/NOARCH/moodle/uk_utf8.zip differ ++++++ vi_utf8.zip ++++++ Files moodle/vi_utf8.zip and /mounts/work_src_done/NOARCH/moodle/vi_utf8.zip differ ++++++ zh_cn_utf8.zip ++++++ Files moodle/zh_cn_utf8.zip and /mounts/work_src_done/NOARCH/moodle/zh_cn_utf8.zip differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 etherboot
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package etherboot checked in at Fri Feb 2 13:01:41 CET 2007. -------- --- arch/i386/etherboot/etherboot.changes 2006-08-10 10:59:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/etherboot/etherboot.changes 2007-02-02 00:44:12.035841000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 2 00:44:00 CET 2007 - ro(a)suse.de + +- added -fno-stack-protector to CFLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etherboot.spec ++++++ --- /var/tmp/diff_new_pack.H11919/_old 2007-02-02 13:01:29.000000000 +0100 +++ /var/tmp/diff_new_pack.H11919/_new 2007-02-02 13:01:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package etherboot (Version 5.4.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,12 @@ # norootforbuild Name: etherboot -License: GPL, BSD +License: BSD License and BSD-like, GNU General Public License (GPL) Group: Productivity/Networking/Boot/Clients Provides: ethboot Autoreqprov: on Version: 5.4.2 -Release: 1 +Release: 23 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-doc-5.2.2.tar.bz2 Patch: etherboot-%{version}-cflags.dif @@ -61,7 +61,7 @@ %build find -name ".cvsignore" -exec rm -rf {} \; cd src -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " make %{?jobs:-j %jobs} all +CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector -fno-strict-aliasing " make %{?jobs:-j %jobs} all for i in `ls bin/*.img`; do dsk=$(basename $i .img) @@ -97,6 +97,8 @@ /usr/lib/etherboot/* %changelog -n etherboot +* Fri Feb 02 2007 - ro(a)suse.de +- added -fno-stack-protector to CFLAGS * Fri Aug 04 2006 - ug(a)suse.de - version update to 5.4.2 - It is now possible to specify static boot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 crash
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package crash checked in at Fri Feb 2 13:01:40 CET 2007. -------- --- crash/crash.changes 2007-01-30 17:29:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/crash/crash.changes 2007-02-02 01:30:38.951349000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 2 01:12:23 CET 2007 - bwalle(a)suse.de + +- update to crash 4.0-3.18 + o enhancement to the "mod" command to expand the number of + section arguments to the internal "add-symbol-file" + o speed up the initialization of crash sessions when running + against multi-gigabyte xen kernels + o Fix for a segmentation violation + o Cosmetic fix to prepend newlines + o Addressed several compiler warnings + o Fix for the s390x "bt -f" command option + +------------------------------------------------------------------- Old: ---- crash-4.0-3.17.tar.bz2 crash-fix-gcc-warnings.diff New: ---- crash-4.0-3.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.ev2948/_old 2007-02-02 12:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.ev2948/_new 2007-02-02 12:59:11.000000000 +0100 @@ -14,8 +14,8 @@ URL: http://people.redhat.com/anderson/ Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles Version: 4.0 -Release: 66 -%define crash_subversion 3.17 +Release: 67 +%define crash_subversion 3.18 %define whitepaper_version 2003 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Debuggers @@ -24,8 +24,7 @@ Source3: README.SUSE BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: crash-fix-lkcd-dumps-sles9.patch -Patch1: crash-fix-gcc-warnings.diff -Patch2: crash-make-emacs-default.diff +Patch1: crash-make-emacs-default.diff %description The core analysis suite is a self-contained tool that can be used to @@ -43,7 +42,6 @@ %setup -q -n %{name}-%{version}-%{crash_subversion} -a 2 %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp %{S:3} . %build @@ -69,6 +67,16 @@ %doc README README.SUSE COPYING %changelog -n crash +* Fri Feb 02 2007 - bwalle(a)suse.de +- update to crash 4.0-3.18 + o enhancement to the "mod" command to expand the number of + section arguments to the internal "add-symbol-file" + o speed up the initialization of crash sessions when running + against multi-gigabyte xen kernels + o Fix for a segmentation violation + o Cosmetic fix to prepend newlines + o Addressed several compiler warnings + o Fix for the s390x "bt -f" command option * Tue Jan 30 2007 - bwalle(a)suse.de - added documentation from webpage ("Crash Whitepaper") - added README.SUSE ++++++ crash-4.0-3.17.tar.bz2 -> crash-4.0-3.18.tar.bz2 ++++++ crash/crash-4.0-3.17.tar.bz2 /mounts/work_src_done/STABLE/crash/crash-4.0-3.18.tar.bz2 differ: byte 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 eiciel
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package eiciel checked in at Fri Feb 2 13:01:23 CET 2007. -------- --- GNOME/eiciel/eiciel.changes 2007-01-26 21:48:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/eiciel/eiciel.changes 2007-01-31 22:16:58.927300000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 31 22:16:36 CET 2007 - jhargadon(a)suse.de + +- added eiciel to Requires of nautilus-eiciel subpackage (#239732) +- specfile cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eiciel.spec ++++++ --- /var/tmp/diff_new_pack.B10464/_old 2007-02-02 13:01:15.000000000 +0100 +++ /var/tmp/diff_new_pack.B10464/_new 2007-02-02 13:01:15.000000000 +0100 @@ -13,7 +13,7 @@ Name: eiciel BuildRequires: gcc-c++ gnome-desktop-devel gnutls-devel gtkmm24-devel intltool libacl-devel libattr-devel libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files Version: 0.9.4 -Release: 12 +Release: 13 URL: http://rofi.pinchito.com/eiciel/ Group: System/GUI/GNOME License: GNU General Public License (GPL) @@ -35,6 +35,7 @@ %package -n nautilus-eiciel Summary: Nautilus ACL viewer and editor extension Group: System/GUI/GNOME +Requires: %{name} = %{version} %description -n nautilus-eiciel A Nautilus extension that allows viewing and editing ACL permissions. @@ -46,25 +47,19 @@ Roger Ferrer Ibanez <rofi(a)ya.com> %prep -%setup -n %{name}-%{version} +%setup %patch %build -aclocal -I m4 -#autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS" -./configure\ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +autoreconf -f -i +%configure \ --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0 make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} -rm $RPM_BUILD_ROOT/usr/share/applications/*.desktop +rm $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.*a %clean @@ -73,7 +68,7 @@ %files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{_prefix}/bin/eiciel +%{_bindir}/eiciel %dir %{_datadir}/eiciel %dir %{_datadir}/eiciel/doc %dir %{_datadir}/eiciel/doc/C @@ -89,6 +84,9 @@ %{_libdir}/nautilus/extensions-1.0/*.so %changelog -n eiciel +* Wed Jan 31 2007 - jhargadon(a)suse.de +- added eiciel to Requires of nautilus-eiciel subpackage (#239732) +- specfile cleanup * Fri Jan 26 2007 - jhargadon(a)suse.de - fixed a shared library packaging bug (#238541) * Thu Jan 25 2007 - ro(a)suse.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

commit dietlibc
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package dietlibc checked in at Fri Feb 2 13:01:08 CET 2007. -------- --- dietlibc/dietlibc.changes 2006-02-19 23:55:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/dietlibc/dietlibc.changes 2007-02-01 11:53:42.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 1 11:52:59 CET 2007 - dmueller(a)suse.de + +- update to 0.30: + * remove upstream'ed patches +- remove glibc-specific flags from RPM_OPT_FLAGS + +------------------------------------------------------------------- Old: ---- cvs-20051012.diff dietlibc-0.29-elf.diff dietlibc-0.29-features.diff dietlibc-0.29-pause.diff dietlibc-0.29-ppc-syscall.diff dietlibc-0.29-qsort.diff dietlibc-0.29-realpath.diff dietlibc-0.29-regparm.diff dietlibc-0.29-setjmp-longjmpg.diff dietlibc-0.29.tar.bz2 dietlibc-0.29.tar.bz2.sign dietlibc-0.29-tcsetattr.diff dietlibc-0.29-types.diff ia64-proc-endp.diff New: ---- dietlibc-0.30-features.diff dietlibc-0.30-pause.diff dietlibc-0.30-ppc-syscall.diff dietlibc-0.30-setjmp-longjmpg.diff dietlibc-0.30.tar.bz2 dietlibc-0.30.tar.bz2.sig dietlibc-0.30-tcsetattr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dietlibc.spec ++++++ --- /var/tmp/diff_new_pack.kN4470/_old 2007-02-02 12:59:39.000000000 +0100 +++ /var/tmp/diff_new_pack.kN4470/_new 2007-02-02 12:59:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package dietlibc (Version 0.29) +# spec file for package dietlibc (Version 0.30) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,28 +11,20 @@ # norootforbuild Name: dietlibc -License: GPL +License: GNU General Public License (GPL) Group: Development/Languages/C and C++ Provides: diet Autoreqprov: on -Version: 0.29 -Release: 6 +Version: 0.30 +Release: 1 Source0: http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2 -Source1: http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2.sign -Patch0: cvs-20051012.diff +Source1: http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2.sig Patch1: %{name}-%{version}-tcsetattr.diff -Patch2: %{name}-%{version}-realpath.diff -Patch3: %{name}-%{version}-qsort.diff -Patch4: %{name}-%{version}-elf.diff -Patch5: %{name}-%{version}-types.diff Patch6: long-double-workaround.diff Patch7: %{name}-%{version}-features.diff -Patch22: ia64-proc-endp.diff Patch23: %{name}-%{version}-setjmp-longjmpg.diff -Patch26: %{name}-%{version}-regparm.diff Patch31: %{name}-%{version}-ppc-syscall.diff Patch32: %{name}-%{version}-pause.diff -Patch33: %{name}-%{version}-types.diff URL: http://www.fefe.de/dietlibc/ Summary: A Libc Optimized for Small Size BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,22 +42,18 @@ %define prefix /opt/dietlibc %prep %setup -q -%patch0 %patch1 -#%patch2 -#%patch3 -#%patch4 -#%patch5 %patch6 %patch7 -%patch22 -#%patch26 %patch31 %patch32 -%patch33 %build -make %{?jobs:-j%jobs} prefix=%{prefix} CFLAGS="`echo $CFLAGS $RPM_OPT_FLAGS | sed s/O2/Os/` -fno-strict-aliasing" +MY_RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's,-O2,-Os,' \ + -e 's/-D_FORTIFY_SOURCE[=0-9]*//' \ + -e 's/-ffortify[=0-9]*//' \ + -e 's/-fstack-protector//') +make %{?jobs:-j%jobs} prefix=%{prefix} CFLAGS="`echo $CFLAGS $MY_RPM_OPT_FLAGS` -fno-strict-aliasing" %install %ifarch hppa @@ -97,6 +85,10 @@ %{_bindir}/* %changelog -n dietlibc +* Thu Feb 01 2007 - dmueller(a)suse.de +- update to 0.30: + * remove upstream'ed patches +- remove glibc-specific flags from RPM_OPT_FLAGS * Sun Feb 19 2006 - dmueller(a)suse.de - fix build on ppc * Wed Jan 25 2006 - mls(a)suse.de ++++++ dietlibc-0.29-features.diff -> dietlibc-0.30-features.diff ++++++ ++++++ dietlibc-0.29-pause.diff -> dietlibc-0.30-pause.diff ++++++ ++++++ dietlibc-0.29-ppc-syscall.diff -> dietlibc-0.30-ppc-syscall.diff ++++++ ++++++ dietlibc-0.29-setjmp-longjmpg.diff -> dietlibc-0.30-setjmp-longjmpg.diff ++++++ ++++++ dietlibc-0.29.tar.bz2 -> dietlibc-0.30.tar.bz2 ++++++ ++++ 7942 lines of diff (skipped) ++++++ dietlibc-0.29-tcsetattr.diff -> dietlibc-0.30-tcsetattr.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 licenses
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package licenses checked in at Fri Feb 2 13:01:00 CET 2007. -------- --- licenses/licenses.changes 2007-01-30 23:42:41.000000000 +0100 +++ /mounts/work_src_done/NOARCH/licenses/licenses.changes 2007-02-01 19:55:16.659162000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 1 19:55:05 CET 2007 - jw(a)suse.de + +- 'eula' added to collect list. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licenses.spec ++++++ --- /var/tmp/diff_new_pack.ia8135/_old 2007-02-02 13:00:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ia8135/_new 2007-02-02 13:00:45.000000000 +0100 @@ -12,7 +12,7 @@ Name: licenses Version: 20070130 -Release: 1 +Release: 2 Url: http://www.novell.com Group: System/Packages License: X11/MIT @@ -57,6 +57,8 @@ # %doc /usr/share/doc/licenses/* %changelog -n licenses +* Thu Feb 01 2007 - jw(a)suse.de +- 'eula' added to collect list. * Tue Jan 30 2007 - jw(a)suse.de - collect_licenses.pl can now feed on rpm's directly. * Tue Jan 16 2007 - jw(a)suse.de ++++++ collect_licenses.pl ++++++ --- licenses/collect_licenses.pl 2007-01-30 23:40:59.000000000 +0100 +++ /mounts/work_src_done/NOARCH/licenses/collect_licenses.pl 2007-02-01 19:54:21.357520000 +0100 @@ -28,6 +28,7 @@ ##################################################################### # 2007-01-16, jw, V1.0 -- initial draft. # 2007-01-30, jw, V1.1 -- rpm scanner added. +# 2007-01-30, jw, V1.2 -- eula added to $collect. use Data::Dumper; use Digest::MD5; @@ -37,7 +38,7 @@ $ENV{PATH} = '/bin:/usr/bin'; delete $ENV{ENV}; -my $version = '1.1'; +my $version = '1.2'; my $verbose = 1; my $tarball = 'licenses.tar.gz'; @@ -47,7 +48,7 @@ my $blacklist_re = '(/usr/share/doc/licenses/|/usr/share/gnump3d/|\.png$|\.jpg$|\.svg$)'; my $collect_cmd_fmt = q{find '%s' -type f | egrep -i '%s'}; -my $collect = q{/usr/share:(license|copying|copyright)}; +my $collect = q{/usr/share:(license|copying|copyright|eula)}; my $cpio = '/usr/bin/cpio --quiet'; my $rpm = '/bin/rpm'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 compat-libstdc++
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package compat-libstdc++ checked in at Fri Feb 2 12:59:32 CET 2007. -------- --- compat-libstdc++/compat-g77.changes 2007-01-25 13:10:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/compat-libstdc++/compat-g77.changes 2007-02-02 00:55:16.339601000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 2 00:55:02 CET 2007 - ro(a)suse.de + +- remove -fstack-protector from CFLAGS + +------------------------------------------------------------------- --- compat-libstdc++/compat-libstdc++.changes 2006-09-28 14:42:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/compat-libstdc++/compat-libstdc++.changes 2007-02-02 00:55:26.249289000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 2 00:55:20 CET 2007 - ro(a)suse.de + +- remove -fstack-protector from CFLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compat-g77.spec ++++++ --- /var/tmp/diff_new_pack.Vb2816/_old 2007-02-02 12:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Vb2816/_new 2007-02-02 12:59:10.000000000 +0100 @@ -21,7 +21,7 @@ %endif Prefix: %_prefix Version: 3.3.5 -Release: 43 +Release: 44 URL: http://gcc.gnu.org/ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: GNU Fortran 77 Compiler @@ -172,7 +172,7 @@ rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} -RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g'` +RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-fstack-protector//g'` %ifarch sparc sparc64 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m64//g' -e 's/-m32//g' -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'` %endif @@ -366,6 +366,8 @@ %doc %{_mandir}/man1/g77.1.gz %changelog -n compat-g77 +* Fri Feb 02 2007 - ro(a)suse.de +- remove -fstack-protector from CFLAGS * Thu Jan 25 2007 - rguenther(a)suse.de - Fix dependencies for s390x build. * Thu Jan 18 2007 - rguenther(a)suse.de ++++++ compat-libstdc++.spec ++++++ --- /var/tmp/diff_new_pack.Vb2816/_old 2007-02-02 12:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Vb2816/_new 2007-02-02 12:59:10.000000000 +0100 @@ -13,7 +13,7 @@ Name: compat-libstdc++ BuildRequires: glibc-devel-32bit Version: 5.0.7 -Release: 46 +Release: 47 Autoreqprov: on License: GNU General Public License (GPL) Group: System/Libraries @@ -164,7 +164,7 @@ rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} -RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g'` +RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-fstack-protector//g'` %ifarch sparc sparc64 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m64//g' -e 's/-m32//g' -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'` %endif @@ -242,6 +242,8 @@ %endif %changelog -n compat-libstdc++ +* Fri Feb 02 2007 - ro(a)suse.de +- remove -fstack-protector from CFLAGS * Thu Sep 28 2006 - rguenther(a)suse.de - Provide libstdc++5. * Mon Mar 06 2006 - schwab(a)suse.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