[CVS] OpenPKG: openpkg-src/monotone/ monotone.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 17-Nov-2009 17:59:41 Branch: HEAD Handle: 2009111716594100 Modified files: openpkg-src/monotonemonotone.spec Log: modifying package: monotone-0.45 20091004 -> 20091117 Summary: RevisionChanges Path 1.50+6 -1 openpkg-src/monotone/monotone.spec patch -p0 <<'@@ .' Index: openpkg-src/monotone/monotone.spec $ cvs diff -u -r1.49 -r1.50 monotone.spec --- openpkg-src/monotone/monotone.spec4 Oct 2009 16:49:58 - 1.49 +++ openpkg-src/monotone/monotone.spec17 Nov 2009 16:59:41 - 1.50 @@ -32,7 +32,7 @@ Group:SCM License: GPL Version: 0.45 -Release: 20091004 +Release: 20091117 # package options %option with_rse yes @@ -83,6 +83,10 @@ %build # configure program +libs="" +case "%{l_platform -t}" in +*-linux* ) libs="$libs -ldl" ;; +esac CC="%{l_cc}" \ CXX="%{l_cxx}" \ CFLAGS="%{l_cflags -O}" \ @@ -93,6 +97,7 @@ CPPFLAGS="%{l_cppflags}" \ %endif LDFLAGS="%{l_ldflags}" \ +LIBS="$libs" \ ./configure \ --prefix=%{l_prefix} \ --infodir=%{l_prefix}/info \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/screen/ screen.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 14-Aug-2009 13:54:17 Branch: HEAD Handle: 2009081412541600 Modified files: openpkg-src/screen screen.spec Log: prefer OpenPKG ncurses over OS curses Summary: RevisionChanges Path 1.57+3 -2 openpkg-src/screen/screen.spec patch -p0 <<'@@ .' Index: openpkg-src/screen/screen.spec $ cvs diff -u -r1.56 -r1.57 screen.spec --- openpkg-src/screen/screen.spec18 Apr 2009 13:15:15 - 1.56 +++ openpkg-src/screen/screen.spec14 Aug 2009 11:54:16 - 1.57 @@ -32,7 +32,7 @@ Group:Terminal License: GPL Version: 4.0.3 -Release: 20080101 +Release: 20090814 # list of sources Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz @@ -78,7 +78,8 @@ # configure package CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} %{l_cppflags ncurses}" \ -LDFLAGS="%{l_ldflags}" \ +LDFLAGS="%{l_ldflags ncurses}" \ +LIBS="-lncurses" \ ./configure \ --prefix=%{l_prefix} \ --with-sys-screenrc=%{l_prefix}/etc/screen/screenrc \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/xpdf/ xpdf.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 10-Apr-2009 22:46:57 Branch: HEAD Handle: 2009041021465700 Modified files: openpkg-src/xpdfxpdf.spec Log: freetype and t1lib are always needed, even with_x11=no Summary: RevisionChanges Path 1.30+7 -5 openpkg-src/xpdf/xpdf.spec patch -p0 <<'@@ .' Index: openpkg-src/xpdf/xpdf.spec $ cvs diff -u -r1.29 -r1.30 xpdf.spec --- openpkg-src/xpdf/xpdf.spec10 Apr 2009 17:42:42 - 1.29 +++ openpkg-src/xpdf/xpdf.spec10 Apr 2009 20:46:57 - 1.30 @@ -50,9 +50,11 @@ BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: freetype >= 2.2, t1lib +PreReq: freetype >= 2.2, t1lib %if "%{with_x11}" == "yes" -BuildPreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif -PreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif +BuildPreReq: X11, xpm, openmotif +PreReq: X11, xpm, openmotif %endif AutoReq: no AutoReqProv: no @@ -97,13 +99,13 @@ --with-appdef-dir=%{l_prefix}/share/xpdf \ --with-Xpm-includes=%{l_prefix}/include \ --with-Xpm-library=%{l_prefix}/lib \ +%else +--without-x \ +%endif --with-t1-includes=%{l_prefix}/include \ --with-t1-library=%{l_prefix}/lib \ --with-freetype2-includes=%{l_prefix}/include \ --with-freetype2-library=%{l_prefix}/lib \ -%else ---without-x \ -%endif --enable-a4-paper %{l_make} %{l_mflags -O} @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/xpdf/ xpdf.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 10-Apr-2009 19:42:42 Branch: HEAD Handle: 2009041018424200 Modified files: openpkg-src/xpdfxpdf.spec Log: allow xpdf building without x11, e.g. if only pdftotext and alike tools are needed Summary: RevisionChanges Path 1.29+11 -2 openpkg-src/xpdf/xpdf.spec patch -p0 <<'@@ .' Index: openpkg-src/xpdf/xpdf.spec $ cvs diff -u -r1.28 -r1.29 xpdf.spec --- openpkg-src/xpdf/xpdf.spec1 Jan 2008 15:07:46 - 1.28 +++ openpkg-src/xpdf/xpdf.spec10 Apr 2009 17:42:42 - 1.29 @@ -1,6 +1,6 @@ ## ## xpdf.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -36,7 +36,10 @@ Group:Postscript License: GPL Version: %{V_base}pl%{V_patchlevel} -Release: 20080101 +Release: 20090410 + +# package options +%option with_x11 yes # list of sources Source0: ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{V_base}.tar.gz @@ -47,8 +50,10 @@ BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 +%if "%{with_x11}" == "yes" BuildPreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif PreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif +%endif AutoReq: no AutoReqProv: no @@ -85,6 +90,7 @@ ./configure \ --prefix=%{l_prefix} \ --sysconfdir=%{l_prefix}/etc/xpdf \ +%if "%{with_x11}" == "yes" --with-x \ --x-includes=`%{l_rc} --query x11_incdir` \ --x-libraries=`%{l_rc} --query x11_libdir` \ @@ -95,6 +101,9 @@ --with-t1-library=%{l_prefix}/lib \ --with-freetype2-includes=%{l_prefix}/include \ --with-freetype2-library=%{l_prefix}/lib \ +%else +--without-x \ +%endif --enable-a4-paper %{l_make} %{l_mflags -O} @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 06-Mar-2009 22:39:25 Branch: HEAD Handle: 2009030621392500 Modified files: openpkg-src/drupal drupal.spec Log: fix incorrect install hint; zen theme requires PHP ctype() Summary: RevisionChanges Path 1.443 +6 -3 openpkg-src/drupal/drupal.spec patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.spec $ cvs diff -u -r1.442 -r1.443 drupal.spec --- openpkg-src/drupal/drupal.spec6 Mar 2009 17:39:24 - 1.442 +++ openpkg-src/drupal/drupal.spec6 Mar 2009 21:39:25 - 1.443 @@ -1,6 +1,6 @@ ## ## drupal.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -452,6 +452,7 @@ PreReq: pcre, pcre::with_utf8 PreReq: apache PreReq: apache-php +PreReq: apache-php::with_ctype = yes PreReq: apache-php::with_gd = yes PreReq: apache-php::with_mbstring = yes PreReq: apache-php::with_session = yes @@ -1799,8 +1800,10 @@ echo " 127.0.0.1, TCP port 8080. Please change this by editing the" echo " \"Listen 127.0.0.1:8080\" directive in" echo " $RPM_INSTALL_PREFIX/etc/drupal/drupal-apache.conf" - echo " Also do not forget to adjust the \$base_url variable in:" - echo " $RPM_INSTALL_PREFIX/share/drupal/sites/default/settings.php" + echo " Also do not forget to cp -p" + echo " $RPM_INSTALL_PREFIX/share/drupal/sites/default/settings.php" + echo " $RPM_INSTALL_PREFIX/share/drupal/sites/settings.php" + echo " and adjust the \$base_url variable." echo "" echo "4. Access Drupal via:" echo " http://127.0.0.1:8080/drupal/ (website view)" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libxml/ libxml.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 25-Jan-2009 17:36:37 Branch: HEAD Handle: 2009012516363600 Modified files: openpkg-src/libxml libxml.spec Log: apply the usual Solaris workaround Summary: RevisionChanges Path 1.125 +3 -2 openpkg-src/libxml/libxml.spec patch -p0 <<'@@ .' Index: openpkg-src/libxml/libxml.spec $ cvs diff -u -r1.124 -r1.125 libxml.spec --- openpkg-src/libxml/libxml.spec19 Jan 2009 18:54:44 - 1.124 +++ openpkg-src/libxml/libxml.spec25 Jan 2009 16:36:36 - 1.125 @@ -1,6 +1,6 @@ ## ## libxml.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -32,7 +32,7 @@ Group:XML License: MIT-style Version: 2.7.3 -Release: 20090119 +Release: 20090125 # list of sources Source0: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz @@ -77,6 +77,7 @@ CFLAGS="%{l_cflags -O} %{l_cppflags}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ +GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-parse/ perl-parse.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 24-Jan-2009 12:26:39 Branch: HEAD Handle: 2009012411263900 Modified files: openpkg-src/perl-parse perl-parse.spec Log: Config::Scoped calls "tar -z" which is not available on stock solaris, workaround using framework tar Summary: RevisionChanges Path 1.251 +3 -3 openpkg-src/perl-parse/perl-parse.spec patch -p0 <<'@@ .' Index: openpkg-src/perl-parse/perl-parse.spec $ cvs diff -u -r1.250 -r1.251 perl-parse.spec --- openpkg-src/perl-parse/perl-parse.spec23 Jan 2009 19:47:29 - 1.250 +++ openpkg-src/perl-parse/perl-parse.spec24 Jan 2009 11:26:39 - 1.251 @@ -1,6 +1,6 @@ ## ## perl-parse.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -63,7 +63,7 @@ Group:Perl License: GPL/Artistic Version: %{V_perl} -Release: 20090123 +Release: 20090124 # list of sources Source0: http://www.cpan.org/modules/by-module/Config/Config-IniFiles-%{V_config_inifiles}.tar.gz @@ -333,7 +333,7 @@ %{l_prefix}/bin/perl-openpkg -d ogdlutils-%{V_ogdl}/perl configure build install %{l_prefix}/bin/perl-openpkg -d %{SOURCE14} configure build install %{l_prefix}/bin/perl-openpkg -d %{SOURCE15} configure build install -%{l_prefix}/bin/perl-openpkg -d %{SOURCE16} configure build install +%{l_prefix}/bin/perl-openpkg -A TAR=%{l_tar} -d %{SOURCE16} configure build install %{l_prefix}/bin/perl-openpkg -d %{SOURCE17} configure build install %{l_prefix}/bin/perl-openpkg -d %{SOURCE18} configure build install %{l_prefix}/bin/perl-openpkg -d %{SOURCE19} configure build install @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bison/ bison.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 20-Jan-2009 20:46:08 Branch: HEAD Handle: 2009012019460800 Modified files: openpkg-src/bison bison.spec Log: avoid building unused parts which are broken on solaris Summary: RevisionChanges Path 1.70+10 -4 openpkg-src/bison/bison.spec patch -p0 <<'@@ .' Index: openpkg-src/bison/bison.spec $ cvs diff -u -r1.69 -r1.70 bison.spec --- openpkg-src/bison/bison.spec 13 Dec 2008 15:27:03 - 1.69 +++ openpkg-src/bison/bison.spec 20 Jan 2009 19:46:08 - 1.70 @@ -1,6 +1,6 @@ ## ## bison.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -36,7 +36,7 @@ Group:CompilerCompiler License: GPL Version: %{V_new} -Release: 20081213 +Release: 20090120 # package options %option with_old no @@ -82,15 +82,21 @@ %patch -p0 -d bison-%{V_new} %setup -q -T -D -a 1 %{l_shtool} subst \ +-e 's;ac_config_files.*etc/bench\.pl";;' \ +bison-%{V_new}/configure +%{l_shtool} subst \ -e 's;^\( *SUBDIRS = .*\) examples\(.*\)$;\1\2;' \ +-e 's;^\( *SUBDIRS = .*\) tests\(.*\)$;\1\2;' \ +-e 's;^\( *SUBDIRS = .*\) etc\(.*\)$;\1\2;' \ bison-%{V_new}/Makefile.in +touch bison-%{V_new}/doc/bison.1 %build ( cd bison-%{V_new} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ - CONFIG_SHELL=/bin/sh \ - ./configure \ + CONFIG_SHELL="%{l_bash}" \ + "%{l_bash}" configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --infodir=%{l_prefix}/info \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libarchive/ libarchive.patch libarchive.spe...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 17-Jan-2009 00:30:47 Branch: HEAD Handle: 2009011623304700 Modified files: openpkg-src/libarchive libarchive.patch libarchive.spec Log: fix building under solaris Summary: RevisionChanges Path 1.11+11 -1 openpkg-src/libarchive/libarchive.patch 1.116 +2 -2 openpkg-src/libarchive/libarchive.spec patch -p0 <<'@@ .' Index: openpkg-src/libarchive/libarchive.patch $ cvs diff -u -r1.10 -r1.11 libarchive.patch --- openpkg-src/libarchive/libarchive.patch 29 Dec 2008 08:13:57 - 1.10 +++ openpkg-src/libarchive/libarchive.patch 16 Jan 2009 23:30:47 - 1.11 @@ -12,7 +12,17 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio Index: cpio/cpio.c --- cpio/cpio.c.orig 2008-12-28 21:08:16 +0100 -+++ cpio/cpio.c 2008-12-29 09:10:01 +0100 cpio/cpio.c 2009-01-17 00:17:29 +0100 +@@ -29,6 +29,9 @@ + __FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $"); + + #include ++#ifdef MAJOR_IN_MKDEV ++# include ++#endif + #include + #include + @@ -60,6 +60,9 @@ #ifdef HAVE_UNISTD_H #include @@ . patch -p0 <<'@@ .' Index: openpkg-src/libarchive/libarchive.spec $ cvs diff -u -r1.115 -r1.116 libarchive.spec --- openpkg-src/libarchive/libarchive.spec29 Dec 2008 08:13:57 - 1.115 +++ openpkg-src/libarchive/libarchive.spec16 Jan 2009 23:30:47 - 1.116 @@ -1,6 +1,6 @@ ## ## libarchive.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -32,7 +32,7 @@ Group:Archiver License: MIT-style Version: 2.6.0 -Release: 20081229 +Release: 20090117 # list of sources Source0: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lzip/ lzip.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: openpkg-src Date: 11-Jan-2009 21:06:09 Branch: HEAD Handle: 2009011120060900 Modified files: openpkg-src/lziplzip.spec Log: fix author as requested by him Summary: RevisionChanges Path 1.6 +3 -3 openpkg-src/lzip/lzip.spec patch -p0 <<'@@ .' Index: openpkg-src/lzip/lzip.spec $ cvs diff -u -r1.5 -r1.6 lzip.spec --- openpkg-src/lzip/lzip.spec4 Jan 2009 10:06:08 - 1.5 +++ openpkg-src/lzip/lzip.spec11 Jan 2009 20:06:09 - 1.6 @@ -1,6 +1,6 @@ ## ## lzip.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -25,14 +25,14 @@ Name: lzip Summary: LZMA Compression URL: http://www.nongnu.org/lzip/lzip.html -Vendor: Antonia Diaz Diaz +Vendor: Antonio Diaz Diaz Packager: OpenPKG Foundation e.V. Distribution: OpenPKG Community Class:EVAL Group:Compression License: GPL Version: 1.3 -Release: 20090104 +Release: 20090111 # list of sources Source0: http://download.savannah.gnu.org/releases/lzip/lzip-%{version}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: CVSROOT/ shiela.cfg
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: t...@openpkg.org Module: CVSROOT Date: 03-Jan-2009 12:14:25 Branch: HEAD Handle: 2009010311142400 Modified files: CVSROOT shiela.cfg Log: membership retirement/cancellation (file was maintained for a long time without being committed) Summary: RevisionChanges Path 1.43+2 -9 CVSROOT/shiela.cfg Change details: http://cvs.openpkg.org/filediff?f=CVSROOT/shiela.cfg&v1=1.42&v2=1.43 __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/milter-sa/ milter-sa.patch milter-sa.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Feb-2008 22:01:41 Branch: HEAD Handle: 2008021921014000 Modified files: openpkg-src/milter-sa milter-sa.patch milter-sa.spec Log: add feature: Custom delivery status notification (DSN) comment Summary: RevisionChanges Path 1.4 +52 -12 openpkg-src/milter-sa/milter-sa.patch 1.9 +1 -1 openpkg-src/milter-sa/milter-sa.spec patch -p0 <<'@@ .' Index: openpkg-src/milter-sa/milter-sa.patch $ cvs diff -u -r1.3 -r1.4 milter-sa.patch --- openpkg-src/milter-sa/milter-sa.patch 6 Aug 2007 19:20:21 - 1.3 +++ openpkg-src/milter-sa/milter-sa.patch 19 Feb 2008 21:01:40 - 1.4 @@ -1,6 +1,6 @@ Index: configure --- configure.orig 2006-04-05 18:00:01 +0200 -+++ configure2007-08-06 21:18:29 +0200 configure2008-02-19 00:08:39 +0100 @@ -7080,9 +7080,6 @@ @@ -22,28 +22,31 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then Index: spamass-milter.1.in --- spamass-milter.1.in.orig 2004-03-18 19:37:08 +0100 -+++ spamass-milter.1.in 2007-08-06 21:18:46 +0200 -@@ -20,6 +20,7 @@ spamass-milter.1.in 2008-02-19 00:08:39 +0100 +@@ -20,6 +20,8 @@ .Op Fl r Ar nn .Op Fl u Ar defaultuser .Op Fl x +.Op Fl a ++.Op Fl c Ar comment .Op Fl - Ar spamc flags ... .Sh DESCRIPTION The -@@ -199,6 +200,9 @@ +@@ -199,6 +201,11 @@ Requires the .Fl u flag. +.It Fl a +Causes spamass-milter to pass through unchecked any messages from connections +established using SMTP authentication. This is useful for sites with remote users. ++.It Fl c Ar comment ++Custom delivery status notification (DSN) comment. Default is "Blocked by SpamAssassin". .It Fl - Ar spamc flags ... Pass all remaining options to spamc. This allows you to connect to a remote spamd with Index: spamass-milter.cpp --- spamass-milter.cpp.orig 2006-03-23 22:41:36 +0100 -+++ spamass-milter.cpp 2007-08-06 21:18:29 +0200 spamass-milter.cpp 2008-02-19 00:08:55 +0100 @@ -100,7 +100,7 @@ extern "C" { #endif @@ -53,24 +56,25 @@ //#include "libmilter/mfdef.h" #if !HAVE_DECL_STRSEP -@@ -170,6 +170,7 @@ +@@ -170,6 +170,8 @@ bool flag_full_email = false; /* pass full email address to spamc */ bool flag_expand = false; /* alias/virtusertable expansion */ bool warnedmacro = false; /* have we logged that we couldn't fetch a macro? */ +bool auth = false; /* don't scan authenticated users */ ++char *comment = NULL; #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */ static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER; -@@ -181,7 +182,7 @@ +@@ -181,7 +183,7 @@ main(int argc, char* argv[]) { int c, err = 0; - const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x"; -+ const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xa"; ++ const char *args = "fc:d:mMp:P:r:u:D:i:b:B:e:xa"; char *sock = NULL; bool dofork = false; char *pidfilename = NULL; -@@ -196,6 +197,9 @@ +@@ -196,9 +198,15 @@ /* Process command line options */ while ((c = getopt(argc, argv, args)) != -1) { switch (c) { @@ -80,24 +84,60 @@ case 'f': dofork = true; break; -@@ -281,7 +285,7 @@ ++case 'c': ++comment = strdup(optarg); ++break; + case 'd': + parse_debuglevel(optarg); + break; +@@ -265,6 +273,8 @@ + break; + } + } ++if (!comment) ++comment = strdup("Blocked by SpamAssassin"); + +if (flag_full_email && !flag_sniffuser) +{ +@@ -281,7 +291,8 @@ cout << "SpamAssassin Sendmail Milter Plugin" << endl; cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl; cout << " [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl; - cout << &qu
[CVS] OpenPKG: openpkg-src/perl/ perl.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Feb-2008 17:45:39 Branch: HEAD Handle: 2008021716453800 Modified files: openpkg-src/perlperl.spec Log: assume ownership for various install dirs (required for rpm5 checking synthesized dependencies on parent directories) Summary: RevisionChanges Path 1.125 +16 -1 openpkg-src/perl/perl.spec patch -p0 <<'@@ .' Index: openpkg-src/perl/perl.spec $ cvs diff -u -r1.124 -r1.125 perl.spec --- openpkg-src/perl/perl.spec3 Jan 2008 18:18:32 - 1.124 +++ openpkg-src/perl/perl.spec17 Feb 2008 16:45:38 - 1.125 @@ -32,7 +32,7 @@ Group:Perl License: GPL/Artistic Version: 5.10.0 -Release: 20080103 +Release: 20080217 # list of sources Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz @@ -156,6 +156,21 @@ -name "*.orig" -print | xargs rm -f ) || exit $? +# assume ownership for various arch/site/vendor install dirs +( eval `./perl -V:installarchlib \ + -V:installprivlib \ + -V:installsitearch \ + -V:installsitelib \ + -V:installvendorarch \ + -V:installvendorlib` + %{l_shtool} mkdir -p "$RPM_BUILD_ROOT$installarchlib/auto" \ + "$RPM_BUILD_ROOT$installprivlib/auto" \ + "$RPM_BUILD_ROOT$installsitearch/auto" \ + "$RPM_BUILD_ROOT$installsitelib/auto" \ + "$RPM_BUILD_ROOT$installvendorarch/auto" \ + "$RPM_BUILD_ROOT$installvendorlib/auto" +) || exit $? + # strip binary files strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/postfix/ postfix.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Feb-2008 12:51:03 Branch: HEAD Handle: 2008021711510200 Modified files: openpkg-src/postfix postfix.spec Log: import fix from https://intevation.de/roundup/kolab/issue2346 Compilation of postfix fails on CentOS 5.1 64Bit Summary: RevisionChanges Path 1.272 +3 -0 openpkg-src/postfix/postfix.spec patch -p0 <<'@@ .' Index: openpkg-src/postfix/postfix.spec $ cvs diff -u -r1.271 -r1.272 postfix.spec --- openpkg-src/postfix/postfix.spec 17 Feb 2008 09:27:08 - 1.271 +++ openpkg-src/postfix/postfix.spec 17 Feb 2008 11:51:02 - 1.272 @@ -191,6 +191,9 @@ if [ -f /usr/lib/libdl.so -o -f /usr/lib/libdl.a ]; then AUXLIBS="$AUXLIBS -ldl" fi +if [ -f /usr/lib64/libdl.so -o -f /usr/lib64/libdl.a ]; then +AUXLIBS="$AUXLIBS -ldl" +fi %endif %if "%{with_ssl}" == "yes" CCARGS="$CCARGS -DUSE_TLS" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/delegate/ delegate.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Feb-2008 22:42:47 Branch: HEAD Handle: 2008021121424700 Modified files: openpkg-src/delegatedelegate.spec Log: the delegate license inhibits redistribution through physical media Summary: RevisionChanges Path 1.135 +4 -3 openpkg-src/delegate/delegate.spec patch -p0 <<'@@ .' Index: openpkg-src/delegate/delegate.spec $ cvs diff -u -r1.134 -r1.135 delegate.spec --- openpkg-src/delegate/delegate.spec1 Jan 2008 14:52:46 - 1.134 +++ openpkg-src/delegate/delegate.spec11 Feb 2008 21:42:47 - 1.135 @@ -28,17 +28,18 @@ Vendor: Yutaka Sato Packager: OpenPKG Foundation e.V. Distribution: OpenPKG Community -Class:BASE +Class:EVAL Group:Network -License: Freely distributable +License: Freely distributable via publicly accessible on-line media Version: 9.8.1 -Release: 20080101 +Release: 20080211 # list of sources Source0: ftp://ftp:[EMAIL PROTECTED]/pub/DeleGate/delegate%{version}.tar.gz Source1: rc.delegate Source2: delegated.cf Patch0: delegate.patch +%NoSource 0 # build information Prefix: %{l_prefix} @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: CVSROOT/ shiela.cfg
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: CVSROOT Date: 10-Feb-2008 21:36:24 Branch: HEAD Handle: 2008021020361800 Modified files: CVSROOT shiela.cfg Log: cleanup foundation membership Summary: RevisionChanges Path 1.42+3 -12 CVSROOT/shiela.cfg Change details: http://cvs.openpkg.org/filediff?f=CVSROOT/shiela.cfg&v1=1.41&v2=1.42 __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/log4net/ log4net.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Jan-2008 22:53:52 Branch: HEAD Handle: 2008012321535100 Added files: openpkg-src/log4net log4net.spec Log: new package: log4net 1.2.10 (Logging Services for .NET) Summary: RevisionChanges Path 1.1 +80 -0 openpkg-src/log4net/log4net.spec patch -p0 <<'@@ .' Index: openpkg-src/log4net/log4net.spec $ cvs diff -u -r0 -r1.1 log4net.spec --- /dev/null 2008-01-23 22:51:30 +0100 +++ log4net.spec 2008-01-23 22:53:51 +0100 @@ -0,0 +1,80 @@ +## +## log4net.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package information +Name: log4net +Summary: Logging Services for .NET +URL: http://logging.apache.org/log4net +Vendor: Apache +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class:EVAL +Group:Libraries +License: Apache Software License +Version: 1.2.10 +Release: 20080123 + +# list of sources +Source0: http://people.apache.org/dist/incubator/log4net/%{version}/incubating-log4net-%{version}.zip + +# build information +Prefix: %{l_prefix} +BuildRoot:%{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20060823, mono, nant, infozip +PreReq: OpenPKG, openpkg >= 20060823, mono +AutoReq: no +AutoReqProv: no + +%description +log4net is a tool to help the programmer output log statements to a +variety of output targets. log4net is a port of the excellent log4j +framework to the .NET runtime. + +%track +prog log4net = { +version = %{version} +url = http://people.apache.org/dist/incubator/log4net/ +regex = (__VER__)/ +} + +%prep +%setup -c -T -n log4net-%{version} +%{l_prefix}/bin/unzip -q -x %{SOURCE0} +mv log4net-%{version}/* . +rmdir log4net-%{version} +%{l_prefix}/bin/sn -k log4net.snk + +%build +%{l_prefix}/bin/nant -buildfile:log4net.build + +%install +rm -rf $RPM_BUILD_ROOT +%{l_prefix}/bin/nant -buildfile:log4net.build -projecthelp +%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean +rm -rf $RPM_BUILD_ROOT + @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nant/ nant.patch nant.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Jan-2008 22:50:49 Branch: HEAD Handle: 2008012321504800 Added files: openpkg-src/nantnant.patch nant.spec Log: new package: nant 0.85 (NAnt is a free .NET build tool) Summary: RevisionChanges Path 1.1 +64 -0 openpkg-src/nant/nant.patch 1.1 +83 -0 openpkg-src/nant/nant.spec patch -p0 <<'@@ .' Index: openpkg-src/nant/nant.patch $ cvs diff -u -r0 -r1.1 nant.patch --- /dev/null 2008-01-23 22:50:36 +0100 +++ nant.patch2008-01-23 22:50:48 +0100 @@ -0,0 +1,64 @@ +excerpt from http://ftp.debian.org/debian/pool/main/n/nant/nant_0.85-2.diff.gz +Index: src/NAnt.Core/Task.cs +--- src/NAnt.Core/Task.cs.orig 2005-10-21 19:13:06 +0200 src/NAnt.Core/Task.cs2007-09-15 20:46:04 +0200 +@@ -400,7 +400,6 @@ + #region Protected Instance Methods + + /// Deprecated (to be deleted). +-[Obsolete("Deprecated- Use InitializeTask instead")] + protected override void InitializeElement(XmlNode elementNode) { + // Just defer for now so that everything just works + InitializeTask(elementNode); +@@ -415,4 +414,4 @@ + + #endregion Protected Instance Methods + } +-} +\ No newline at end of file ++} +Index: Makefile +--- Makefile.orig2005-12-11 09:47:54 +0100 Makefile 2007-09-15 21:18:00 +0200 +@@ -40,7 +40,7 @@ + rm -fR build bootstrap + + install: bootstrap +-$(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)" ++$(NANT) -f:NAnt.build install-openpkg -D:install.buildroot="$(buildroot)" + + run-test: bootstrap + $(NANT) -f:NAnt.build test + +Index: NAnt.build +--- NAnt.build.orig 2006-10-14 16:01:34 +0200 NAnt.build 2007-09-15 22:51:30 +0200 +@@ -780,7 +780,7 @@ + + + +- ++ + + + +@@ -805,6 +805,18 @@ + exec ${path::combine(prefix, 'bin')}/mono ${path::combine(install.copylocation, 'bin')}/NAnt.exe "$@" + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + @@ . patch -p0 <<'@@ .' Index: openpkg-src/nant/nant.spec $ cvs diff -u -r0 -r1.1 nant.spec --- /dev/null 2008-01-23 22:50:36 +0100 +++ nant.spec 2008-01-23 22:50:48 +0100 @@ -0,0 +1,83 @@ +## +## nant.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package information +Name: nant +Summary: NAnt is a free .NET build tool +URL: http://nant.sourceforge.net/ +Vendor: Gerry Shaw et al. +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class:EVAL +Group:Building +License: GPL +Version: 0.85 +Release: 20080123 + +# list of sources +Source0: http://switch.dl.sourceforge.net/nant/nant-%{vers
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-Oct-2007 23:59:50 Branch: HEAD Handle: 2007103122594900 Modified files: openpkg-src/gcc gcc.spec Log: force PIC on certain platforms (logic taken from OpenSSL embedded in OpenPKG bootstrap) to get a relocatable libstdc++ (fixing aqbanking on amd64) Summary: RevisionChanges Path 1.151 +8 -1 openpkg-src/gcc/gcc.spec patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.150 -r1.151 gcc.spec --- openpkg-src/gcc/gcc.spec 16 Oct 2007 19:06:38 - 1.150 +++ openpkg-src/gcc/gcc.spec 31 Oct 2007 22:59:49 - 1.151 @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20071016 +Release: 20071031 # package options %option with_binutils yes @@ -190,6 +190,7 @@ l_ccisgcc=yes fi l_cflags="" +l_cxxflags="" l_boot_cflags="" l_libcflags="-g" l_libcxxflags="-g" @@ -225,12 +226,18 @@ maketarget="profiledbootstrap" fi %endif +case "%{l_platform -t}" in +amd64-* ) l_cflags="$l_cflags -fPIC"; l_cxxflags="$l_cxxflags -fPIC" ;; +ia64-* ) l_cflags="$l_cflags -fPIC"; l_cxxflags="$l_cxxflags -fPIC" ;; +sparc64-freebsd* ) l_cflags="$l_cflags -fPIC"; l_cxxflags="$l_cxxflags -fPIC" ;; +esac # build the package %{l_make} %{l_mflags} \ MAKE="%{l_make} %{l_mflags}" \ BOOT_CFLAGS="${l_boot_cflags}" \ CFLAGS="${l_cflags}" \ +CXXFLAGS="${l_cxxflags}" \ LIBCFLAGS="${l_libcflags}" \ LIBCXXFLAGS="${l_libcxxflags}" \ $maketarget @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ssmtp/ ssmtp.patch ssmtp.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Sep-2007 09:01:58 Branch: HEAD Handle: 2007092008015700 Modified files: openpkg-src/ssmtp ssmtp.patch ssmtp.spec Log: work around suse10.1 "conflicting types" build error and fix various amd64 "cast pointer to integer" warnings Summary: RevisionChanges Path 1.10+194 -0 openpkg-src/ssmtp/ssmtp.patch 1.68+1 -1 openpkg-src/ssmtp/ssmtp.spec patch -p0 <<'@@ .' Index: openpkg-src/ssmtp/ssmtp.patch $ cvs diff -u -r1.9 -r1.10 ssmtp.patch --- openpkg-src/ssmtp/ssmtp.patch 19 Sep 2007 11:50:13 - 1.9 +++ openpkg-src/ssmtp/ssmtp.patch 20 Sep 2007 07:01:57 - 1.10 @@ -226,3 +226,197 @@ +Matt Ryan ([EMAIL PROTECTED]), Hugo Haas ([EMAIL PROTECTED]), Christoph Lameter ([EMAIL PROTECTED]) +and Dave Collier-Brown ([EMAIL PROTECTED]). +Reuben Thomas ([EMAIL PROTECTED]) wrote the man page. + +workaround amd64-suse10.1 error: conflicting types for 'basename' +fix amd64-suse10.1 warnings: cast from pointer to integer of different size +Index: ssmtp.c +--- ssmtp.c.orig 2007-09-20 08:27:18.0 +0200 ssmtp.c 2007-09-20 08:45:24.0 +0200 +@@ -40,6 +40,9 @@ + #endif + #include "ssmtp.h" + ++#ifndef NUL ++#define NUL '\0' ++#endif + + bool_t have_date = False; + bool_t have_from = False; +@@ -56,20 +59,20 @@ + + #define ARPADATE_LENGTH 32 /* Current date in RFC format */ + char arpadate[ARPADATE_LENGTH]; +-char *auth_user = (char)NULL; +-char *auth_pass = (char)NULL; +-char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */ +-char *mail_domain = (char)NULL; +-char *from = (char)NULL;/* Use this as the From: address */ ++char *auth_user = (char *)NULL; ++char *auth_pass = (char *)NULL; ++char *auth_method = (char *)NULL; /* Mechanism for SMTP authentication */ ++char *mail_domain = (char *)NULL; ++char *from = (char *)NULL; /* Use this as the From: address */ + char hostname[MAXHOSTNAMELEN] = "localhost"; + char *mailhost = "mailhub"; +-char *minus_f = (char)NULL; +-char *minus_F = (char)NULL; ++char *minus_f = (char *)NULL; ++char *minus_F = (char *)NULL; + char *gecos; +-char *prog = (char)NULL; ++char *prog = (char *)NULL; + char *root = NULL; + char *tls_cert = "/etc/ssl/certs/ssmtp.pem";/* Default Certificate */ +-char *uad = (char)NULL; ++char *uad = (char *)NULL; + + headers_t headers, *ht; + +@@ -217,7 +220,7 @@ + /* + basename() -- Return last element of path + */ +-char *basename(char *str) ++char *mybasename(char *str) + { + char buf[MAXPATHLEN +1], *p; + +@@ -231,7 +234,7 @@ + die("basename() -- strncpy() failed"); + } + } +-buf[MAXPATHLEN] = (char)NULL; ++buf[MAXPATHLEN] = NUL; + + return(strdup(buf)); + } +@@ -258,7 +261,7 @@ + + p = (str + strlen(str)); + while(isspace((int)(*--p))) { +-*p = (char)NULL; ++*p = NUL; + } + + return(p); +@@ -307,7 +310,7 @@ + q = strip_post_ws(p); + if(*q == ')') { + while((*--q != '(')); +-*q = (char)NULL; ++*q = NUL; + } + (void)strip_post_ws(p); + +@@ -350,7 +353,7 @@ + char *p; + + if((p = strchr(str, '\n'))) { +-*p = (char)NULL; ++*p = NUL; + } + + /* Any line beginning with a dot has an additional dot inserted; +@@ -383,7 +386,7 @@ + while(fgets(buf, sizeof(buf), fp)) { + /* Make comments invisible */ + if((p = strchr(buf, '#'))) { +-*p = (char)NULL; ++*p = NUL; + } + + /* Ignore malformed lines and comments */ +@@ -513,7 +516,7 @@ + #endif + + /* Ignore missing usernames */ +-if(*str == (char)NULL) { ++if(*str == NUL) { + return; + } + +@@ -570,7 +573,7 @@ + } + + /* End of string? */ +-if(*(q + 1) == (char)NULL) { ++if(*(q + 1) == NUL) { + got_addr = Tru
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Sep-2007 17:33:53 Branch: HEAD Handle: 2007090916335200 Modified files: openpkg-src/openpkg HISTORY openpkg.spec rpmmacros Log: print entire list of all %NoSource files instead of bailing out on the first missing file encountered Summary: RevisionChanges Path 1.473 +1 -0 openpkg-src/openpkg/HISTORY 1.608 +1 -1 openpkg-src/openpkg/openpkg.spec 1.83+1 -1 openpkg-src/openpkg/rpmmacros patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.472 -r1.473 HISTORY --- openpkg-src/openpkg/HISTORY 24 Aug 2007 12:29:48 - 1.472 +++ openpkg-src/openpkg/HISTORY 9 Sep 2007 15:33:52 - 1.473 @@ -2,6 +2,7 @@ 2007 +20070909 print entire list of all %NoSource files instead of bailing out on the first missing file encountered 20070321 upgrade to openpkg-registry 1.1.3 remove legacy code which had the side effect of the REGISTRY_UUID file being touched hourly 20070718 "diff reduction" to RPM 5 development version (no functional change) 20070717 fix a very long-standing cruel implementation bug in the platform detection @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.607 -r1.608 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 24 Aug 2007 12:29:48 - 1.607 +++ openpkg-src/openpkg/openpkg.spec 9 Sep 2007 15:33:52 - 1.608 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070824 +%define V_openpkg 20070909 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmmacros $ cvs diff -u -r1.82 -r1.83 rpmmacros --- openpkg-src/openpkg/rpmmacros 19 Apr 2007 10:41:52 - 1.82 +++ openpkg-src/openpkg/rpmmacros 9 Sep 2007 15:33:52 - 1.83 @@ -333,7 +333,7 @@ %integrity() %{l_check_nosource} # macros for checking build environment -%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [ ".$url" = .. ] && continue; eval `echo "$url" | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> \\"; file=\\"\\2\\"!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e 's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then echo "set +x"; ( echo "Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo "Before you can proceed building this package you have to MANUALLY fetch"; echo "${url}${file}"; echo "and provide it locally under the path"; echo "%{_sourcedir}/$file" ) | %{l_rpmtool} msg -b -t error | sed -e 's;^;echo ";' -e 's;$;";'; echo "exit 1"; fi; done) +%l_check_nosource() %(%{l_sane_env}; checkok=1; checkinfo=`echo "Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo "Before you can proceed building this package, fetch missing files MANUALLY:"`; for url in . %{?_restricted}; do [ ".$url" = .. ] && continue; eval `echo "$url" | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e 's:^\\([^;].*\\)$:;url="(unknown location) "; file="\\1":' -e 's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then checkok=0; checkinfo=`echo "${checkinfo}"; echo ""; echo "from ${url}"; echo "file ${file}"; echo "here %{_sourcedir}/$file"`; fi; done; if [ $checkok -ne 1 ]; then echo "set +x"; echo "$checkinfo" | %{l_rpmtool} msg -b -t error | sed -e 's;^;echo ";' -e 's;$;";'; echo "exit 1"; fi) %l_check_class() %(%{l_sane_env}; class=`echo "@:%{?class}:%{?distribution}" | sed -e 's;^@:\\([^:][^:]*\\):.*$;\\1;' -e 's;^@:.*\\[\\(.*\\)\\].*$;\\1;' -e 's;^@:.*$;JUNK;'`; %{l_rpmtool} check-class "$class") %prep %%prep\ %{l_check_nosource} \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 24-Aug-2007 14:05:44 Branch: HEAD Handle: 2007082413054301 Modified files: openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl registry.pm Log: bump before release Summary: RevisionChanges Path 1.34+1 -1 openpkg-registry/VERSION 1.66+2 -2 openpkg-registry/register.sh 1.59+2 -2 openpkg-registry/registry-db.pl 1.108 +2 -2 openpkg-registry/registry-ui.pl 1.16+2 -2 openpkg-registry/registry.pm patch -p0 <<'@@ .' Index: openpkg-registry/VERSION $ cvs diff -u -r1.33 -r1.34 VERSION --- openpkg-registry/VERSION 21 Mar 2007 10:03:01 - 1.33 +++ openpkg-registry/VERSION 24 Aug 2007 12:05:43 - 1.34 @@ -2,5 +2,5 @@ VERSION -- Version Information for OpenPKG Registry (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OpenPKG Registry, Version 1.1.2 (21-Mar-2007) + This is OpenPKG Registry, Version 1.1.3 (24-Aug-2007) @@ . patch -p0 <<'@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.65 -r1.66 register.sh --- openpkg-registry/register.sh 24 Aug 2007 12:02:45 - 1.65 +++ openpkg-registry/register.sh 24 Aug 2007 12:05:43 - 1.66 @@ -29,8 +29,8 @@ # program name, version and date progname="register" -progvers="1.1.2" -progdate="21-Mar-2007" +progvers="1.1.3" +progdate="24-Aug-2007" # determine path to OpenPKG instance PREFIX="@l_prefix@" @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-db.pl $ cvs diff -u -r1.58 -r1.59 registry-db.pl --- openpkg-registry/registry-db.pl 21 Mar 2007 10:03:01 - 1.58 +++ openpkg-registry/registry-db.pl 24 Aug 2007 12:05:43 - 1.59 @@ -34,8 +34,8 @@ # program name, version and date my $progname="registry-db.pl"; -my $progvers="1.1.2"; -my $progdate="21-Mar-2007"; +my $progvers="1.1.3"; +my $progdate="24-Aug-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-ui.pl $ cvs diff -u -r1.107 -r1.108 registry-ui.pl --- openpkg-registry/registry-ui.pl 21 Mar 2007 10:03:01 - 1.107 +++ openpkg-registry/registry-ui.pl 24 Aug 2007 12:05:43 - 1.108 @@ -41,8 +41,8 @@ # program name, version and date my $progname="registry-ui.pl"; -my $progvers="1.1.2"; -my $progdate="21-Mar-2007"; +my $progvers="1.1.3"; +my $progdate="24-Aug-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry.pm $ cvs diff -u -r1.15 -r1.16 registry.pm --- openpkg-registry/registry.pm 21 Mar 2007 10:03:01 - 1.15 +++ openpkg-registry/registry.pm 24 Aug 2007 12:05:44 - 1.16 @@ -30,8 +30,8 @@ # program name, version and date my $progname="registry.pm"; -my $progvers="1.1.2"; -my $progdate="21-Mar-2007"; +my $progvers="1.1.3"; +my $progdate="24-Aug-2007"; # get configuration file name # @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ README
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 24-Aug-2007 14:05:30 Branch: HEAD Handle: 2007082413053000 Modified files: openpkg-registryREADME Log: review TODO, most issues gone Summary: RevisionChanges Path 1.3 +0 -6 openpkg-registry/README patch -p0 <<'@@ .' Index: openpkg-registry/README $ cvs diff -u -r1.2 -r1.3 README --- openpkg-registry/README 28 Nov 2005 07:09:02 - 1.2 +++ openpkg-registry/README 24 Aug 2007 12:05:30 - 1.3 @@ -5,11 +5,5 @@ TODO -- occasional "not logged in" when coming back from ase -- bold font in status line is too large - not all fields shown -- additional user data -- documentation -- database backup -- ase password recovery and account termination @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Aug-2007 14:30:05 Branch: HEAD Handle: 2007082413300400 Modified files: openpkg-src/openpkg-registry openpkg-registry.spec Log: upgrading package: openpkg 20070718 -> 20070824 Summary: RevisionChanges Path 1.39+2 -2 openpkg-src/openpkg-registry/openpkg-registry.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg-registry/openpkg-registry.spec $ cvs diff -u -r1.38 -r1.39 openpkg-registry.spec --- openpkg-src/openpkg-registry/openpkg-registry.spec22 Jun 2007 11:01:45 - 1.38 +++ openpkg-src/openpkg-registry/openpkg-registry.spec24 Aug 2007 12:30:04 - 1.39 @@ -32,8 +32,8 @@ Class:PLUS Group:Bootstrapping License: BSD-style -Version: 1.1.2 -Release: 20070622 +Version: 1.1.3 +Release: 20070824 # package options %option with_client yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Aug-2007 14:29:49 Branch: HEAD Handle: 2007082413294800 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrading package: openpkg 20070718 -> 20070824 Summary: RevisionChanges Path 1.472 +1 -0 openpkg-src/openpkg/HISTORY 1.607 +2 -2 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.471 -r1.472 HISTORY --- openpkg-src/openpkg/HISTORY 18 Jul 2007 21:04:23 - 1.471 +++ openpkg-src/openpkg/HISTORY 24 Aug 2007 12:29:48 - 1.472 @@ -2,6 +2,7 @@ 2007 +20070321 upgrade to openpkg-registry 1.1.3 remove legacy code which had the side effect of the REGISTRY_UUID file being touched hourly 20070718 "diff reduction" to RPM 5 development version (no functional change) 20070717 fix a very long-standing cruel implementation bug in the platform detection 20070711 upgrade to cURL 7.16.4 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.606 -r1.607 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 18 Jul 2007 21:04:23 - 1.606 +++ openpkg-src/openpkg/openpkg.spec 24 Aug 2007 12:29:48 - 1.607 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070718 +%define V_openpkg 20070824 # the used software versions %define V_rpm 4.2.1 @@ -55,7 +55,7 @@ %define V_bash 3.2 %define V_uuid 1.6.0 %define V_config 20060923 -%define V_registry 1.1.2 +%define V_registry 1.1.3 %define V_perl 5.8.8 %define V_openssl 0.9.8e %define V_tools1.4.5 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ Makefile
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 24-Aug-2007 14:15:14 Branch: HEAD Handle: 2007082413151400 Modified files: openpkg-registryMakefile Log: bump before release Summary: RevisionChanges Path 1.22+2 -2 openpkg-registry/Makefile patch -p0 <<'@@ .' Index: openpkg-registry/Makefile $ cvs diff -u -r1.21 -r1.22 Makefile --- openpkg-registry/Makefile 9 Aug 2006 12:41:39 - 1.21 +++ openpkg-registry/Makefile 24 Aug 2007 12:15:14 - 1.22 @@ -18,10 +18,10 @@ clean: @( rm openpkg-registry-*.tar.gz \ register.8 registry-db.8 registry.cfg \ - *.dat \ $(TMP)/rm0/* $(TMP)/en2/* 2>/dev/null; \ rmdir $(TMP)/rm0 $(TMP)/en2 $(TMP) \ ) 2>/dev/null || true + @echo consider discarding *.dat files to enable their fresh recreation release: @$(MAKE) $(MFLAGS) version @@ -72,7 +72,7 @@ $(PERL) registry-db.pl defcfg >registry.cfg businesscategories.dat: - curl --silent 'http://dmoz.org/Business/' \ + curl --silent 'http://www.dmoz.org/Business/' \ | grep '"/Business/' \ | sed -e 's;^.*"/Business/;;' -e 's;/".*$$;;' -e 's;_; ;g' \ | ( cat; echo "Private"; echo "Non-Profit Organization" ) \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ register.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 24-Aug-2007 14:02:45 Branch: HEAD Handle: 2007082413024500 Modified files: openpkg-registryregister.sh Log: remove legacy code which had the side effect of the REGISTRY_UUID file being touched hourly; update documentation Summary: RevisionChanges Path 1.65+1 -20 openpkg-registry/register.sh patch -p0 <<'@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.64 -r1.65 register.sh --- openpkg-registry/register.sh 21 Mar 2007 10:02:32 - 1.64 +++ openpkg-registry/register.sh 24 Aug 2007 12:02:45 - 1.65 @@ -72,14 +72,6 @@ { [ ".$REGISTRY_CONF" = . ] && return if [ -r "$REGISTRY_CONF" ]; then - -# upgrade safety for changed variable name -# please remove this code after 2007-06 snapshot -"$PREFIX/lib/openpkg/shtool" subst \ --e 's;^\( *REGISTRY_UUID *= *"[^/].*\)$;#\1;' \ -"$REGISTRY_CONF" \ ->/dev/null 2>&1 || true - sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF" fi } @@ -88,14 +80,6 @@ { [ ".$REGISTRY_UUID" = . ] && return if [ -r "$REGISTRY_UUID" ]; then - -# upgrade safety for changed variable name -# please remove this code after 2007-06 snapshot -"$PREFIX/lib/openpkg/shtool" subst \ --e 's;^ *REGISTRY_UUID *=;REGISTRY_DBID=;' \ -"$REGISTRY_UUID" \ ->/dev/null 2>&1 || true - sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID" fi } @@ -729,13 +713,10 @@ used by administrators to register an instance with the OpenPKG Registry for later association. -Automatic association is intentionally not possible and login to the web form -on http://registry.openpkg.org/ is required. - After association, B can be used for repetitive reregistrations which update the heartbeat of the instance on the Registry server, avoiding premature depature from the database. It is assumed that -every instance will be reregistered every quarter of the year. Dormant +every instance will be reregistered daily. Dormant instances might be discarded from the Registry, revoking their access to additional resources. @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/ VERSION
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 23-Jun-2007 21:50:46 Branch: HEAD Handle: 2007062320504600 Modified files: openpkg-tools VERSION Log: bump before release Summary: RevisionChanges Path 1.99+1 -1 openpkg-tools/VERSION patch -p0 <<'@@ .' Index: openpkg-tools/VERSION $ cvs diff -u -r1.98 -r1.99 VERSION --- openpkg-tools/VERSION 2 Mar 2007 09:49:43 - 1.98 +++ openpkg-tools/VERSION 23 Jun 2007 19:50:46 - 1.99 @@ -2,5 +2,5 @@ VERSION -- Version Information for OpenPKG Tool Chain (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OpenPKG Tool Chain, Version 1.4.4 (02-Mar-2007) + This is OpenPKG Tool Chain, Version 1.4.5 (23-Jun-2007) @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ makeproxy.pl
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 23-Jun-2007 21:49:11 Branch: HEAD Handle: 2007062320491100 Modified files: openpkg-tools/cmd makeproxy.pl Log: options eventually become provides, so let "openpkg makeproxy" fake provides, too Summary: RevisionChanges Path 1.8 +7 -1 openpkg-tools/cmd/makeproxy.pl patch -p0 <<'@@ .' Index: openpkg-tools/cmd/makeproxy.pl $ cvs diff -u -r1.7 -r1.8 makeproxy.pl --- openpkg-tools/cmd/makeproxy.pl1 Jan 2007 17:45:11 - 1.7 +++ openpkg-tools/cmd/makeproxy.pl23 Jun 2007 19:49:11 - 1.8 @@ -240,6 +240,7 @@ $q .= "S-$t:<%{$t}>\\n"; } $q .= '[M-PREREQ:<%{REQUIRENAME} %|REQUIREFLAGS?{%{REQUIREFLAGS:depflags} %{REQUIREVERSION}}:{}|>\n]'; +$q .= '[M-PROVIDES:<%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|>\n]'; $q .= '[M-PREFIXES:<%{PREFIXES}>\n]'; my $cmd = sprintf("%s -q %s --qf '$q' %s", $master_rpm, (-f $input ? "-p" : ""), $input); my $o = runcmd("$cmd|"); @@ -251,6 +252,7 @@ $r = parseresponse($r, $o); my $BD = ''; my $ID = ''; +my $PR = ''; foreach my $d (@{$r->{PREREQ}}) { if ($d =~ m|^OpenPKG|i) { $BD .= ", " if ($BD ne ''); @@ -259,6 +261,10 @@ $ID .= ", " if ($ID ne ''); $ID .= $d; } +foreach my $d (@{$r->{PROVIDES}}) { +$PR .= ", " if ($PR ne ''); +$PR .= $d; +} # prepare build environment verbose("++ establishing temporary OpenPKG RPM environment"); @@ -304,9 +310,9 @@ $S .= "BuildRoot:$tmpdir/bld\n"; $S .= "BuildPreReq: $BD\n" if ($BD ne ''); $S .= "PreReq: $ID\n" if ($ID ne ''); +$S .= "Provides: $PR\n" if ($PR ne ''); $S .= "AutoReq: no\n"; $S .= "AutoReqProv: no\n"; -$S .= "Provides: ".$r->{NAME}." = ".$r->{VERSION}."-".$r->{RELEASE}."\n"; $S .= "\n"; $S .= "\%description\n"; $S .= "".$r->{DESCRIPTION}."\n"; @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/axkit/ axkit-apache.conf openpkg-src/cacti/...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Jun-2007 18:24:51 Branch: HEAD Handle: 2007062217244902 Modified files: openpkg-src/axkit axkit-apache.conf openpkg-src/cacti cacti-apache.conf cacti.spec openpkg-src/drupal drupal-apache.conf openpkg-src/mediawiki mediawiki-apache.conf openpkg-src/phpbb phpbb-apache.conf openpkg-src/punbb punbb-apache.conf punbb.spec Log: adopt more configs for apache2 Summary: RevisionChanges Path 1.2 +3 -4 openpkg-src/axkit/axkit-apache.conf 1.3 +3 -4 openpkg-src/cacti/cacti-apache.conf 1.39+1 -1 openpkg-src/cacti/cacti.spec 1.3 +3 -4 openpkg-src/drupal/drupal-apache.conf 1.2 +3 -4 openpkg-src/mediawiki/mediawiki-apache.conf 1.3 +3 -4 openpkg-src/phpbb/phpbb-apache.conf 1.2 +3 -4 openpkg-src/punbb/punbb-apache.conf 1.3 +1 -1 openpkg-src/punbb/punbb.spec patch -p0 <<'@@ .' Index: openpkg-src/axkit/axkit-apache.conf $ cvs diff -u -r1.1 -r1.2 axkit-apache.conf --- openpkg-src/axkit/axkit-apache.conf 10 Mar 2007 22:24:48 - 1.1 +++ openpkg-src/axkit/axkit-apache.conf 22 Jun 2007 16:24:49 - 1.2 @@ -2,14 +2,12 @@ ## axkit-apache.conf -- AxKit Apache Custom Configuration ## -ServerType standalone ServerRoot @l_prefix@ ServerAdminroot@@[EMAIL PROTECTED]@l_domainname@ ServerName @[EMAIL PROTECTED]@l_domainname@ ServerTokens Prod User @l_rusr@ Group @l_rgrp@ -Port 8080 Listen 127.0.0.1:8080 # runtime files @@ -17,6 +15,9 @@ ScoreBoardFile @l_prefix@/var/axkit/run/apache.sb LockFile @l_prefix@/var/axkit/run/apache.lck +# include apache-perl +Include@l_prefix@/etc/apache/apache.d/apache-perl.conf + # server behaviour Timeout300 KeepAlive on @@ -62,8 +63,6 @@ SSLMutexsem SSLSessionCache shmcb:@l_prefix@/var/axkit/run/apache.scache(512000) SSLSessionCacheTimeout 300 -SSLLog @l_prefix@/var/axkit/log/apache.ssl.log -SSLLogLevel warn SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL SetEnvIf User-Agent ".*MSIE.*" \ nokeepalive ssl-unclean-shutdown \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/cacti/cacti-apache.conf $ cvs diff -u -r1.2 -r1.3 cacti-apache.conf --- openpkg-src/cacti/cacti-apache.conf 19 Aug 2003 15:18:30 - 1.2 +++ openpkg-src/cacti/cacti-apache.conf 22 Jun 2007 16:24:49 - 1.3 @@ -2,14 +2,12 @@ ## cacti-apache.conf -- Cacti Apache Custom Configuration ## -ServerType standalone ServerRoot @l_prefix@ ServerAdminroot@@[EMAIL PROTECTED]@l_domainname@ ServerName @[EMAIL PROTECTED]@l_domainname@ ServerTokens Prod User @l_rusr@ Group @l_rgrp@ -Port 8080 Listen 127.0.0.1:8080 # runtime files @@ -17,6 +15,9 @@ ScoreBoardFile @l_prefix@/var/cacti/run/apache.sb LockFile @l_prefix@/var/cacti/run/apache.lck +# include apache-php +Include@l_prefix@/etc/apache/apache.d/apache-php.conf + # server behaviour Timeout300 KeepAlive on @@ -62,8 +63,6 @@ SSLMutexsem SSLSessionCache shmcb:@l_prefix@/var/cacti/run/apache.scache(512000) SSLSessionCacheTimeout 300 -SSLLog @l_prefix@/var/cacti/log/apache.ssl.log -SSLLogLevel warn SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL SetEnvIf User-Agent ".*MSIE.*" \ nokeepalive ssl-unclean-shutdown \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/cacti/cacti.spec $ cvs diff -u -r1.38 -r1.39 cacti.spec --- openpkg-src/cacti/ca
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress-apache.conf
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Jun-2007 17:42:33 Branch: HEAD Handle: 2007062216423300 Modified files: openpkg-src/wordpress wordpress-apache.conf Log: replace my personal path with generic stuff Summary: RevisionChanges Path 1.8 +1 -1 openpkg-src/wordpress/wordpress-apache.conf patch -p0 <<'@@ .' Index: openpkg-src/wordpress/wordpress-apache.conf $ cvs diff -u -r1.7 -r1.8 wordpress-apache.conf --- openpkg-src/wordpress/wordpress-apache.conf 22 Jun 2007 15:39:25 - 1.7 +++ openpkg-src/wordpress/wordpress-apache.conf 22 Jun 2007 15:42:33 - 1.8 @@ -16,7 +16,7 @@ LockFile @l_prefix@/var/wordpress/wordpress-apache.lck # include apache-php -Include "/s/lot/etc/apache/apache.d/apache-php.conf" +Include@l_prefix@/etc/apache/apache.d/apache-php.conf # server behaviour Timeout300 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress-apache.conf
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Jun-2007 17:39:25 Branch: HEAD Handle: 2007062216392500 Modified files: openpkg-src/wordpress wordpress-apache.conf Log: adopt wordpress config for apache2 Summary: RevisionChanges Path 1.7 +3 -4 openpkg-src/wordpress/wordpress-apache.conf patch -p0 <<'@@ .' Index: openpkg-src/wordpress/wordpress-apache.conf $ cvs diff -u -r1.6 -r1.7 wordpress-apache.conf --- openpkg-src/wordpress/wordpress-apache.conf 16 Feb 2007 20:42:52 - 1.6 +++ openpkg-src/wordpress/wordpress-apache.conf 22 Jun 2007 15:39:25 - 1.7 @@ -2,14 +2,12 @@ ## wordpress-apache.conf -- Wordpress Apache Custom Configuration ## -ServerType standalone ServerRoot @l_prefix@ ServerAdminroot@@[EMAIL PROTECTED]@l_domainname@ ServerName @[EMAIL PROTECTED]@l_domainname@ ServerTokens Prod User @l_rusr@ Group @l_rgrp@ -Port 8081 Listen 127.0.0.1:8081 # runtime files @@ -17,6 +15,9 @@ ScoreBoardFile @l_prefix@/var/wordpress/wordpress-apache.sb LockFile @l_prefix@/var/wordpress/wordpress-apache.lck +# include apache-php +Include "/s/lot/etc/apache/apache.d/apache-php.conf" + # server behaviour Timeout300 KeepAlive on @@ -62,8 +63,6 @@ SSLMutexsem SSLSessionCache shmcb:@l_prefix@/var/wordpress/wordpress-apache.scache(512000) SSLSessionCacheTimeout 300 -SSLLog @l_prefix@/var/wordpress/wordpress-apache.ssl.log -SSLLogLevel warn SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL SetEnvIf User-Agent ".*MSIE.*" \ nokeepalive ssl-unclean-shutdown \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/boost/ boost.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Jun-2007 23:28:30 Branch: HEAD Handle: 2007061822283000 Modified files: openpkg-src/boost boost.spec Log: make compression optional and make sure the OpenPKG headers and libraries are picked up Summary: RevisionChanges Path 1.14+37 -5 openpkg-src/boost/boost.spec patch -p0 <<'@@ .' Index: openpkg-src/boost/boost.spec $ cvs diff -u -r1.13 -r1.14 boost.spec --- openpkg-src/boost/boost.spec 17 Jun 2007 19:18:32 - 1.13 +++ openpkg-src/boost/boost.spec 18 Jun 2007 21:28:30 - 1.14 @@ -37,12 +37,14 @@ Group:Language License: Boost Software License Version: %{V_openpkg} -Release: 20070617 +Release: 20070618 # package options %option with_debug yes %option with_optimize yes %option with_threads yes +%option with_zlib yes +%option with_bzip2 yes # list of sources Source0: http://switch.dl.sourceforge.net/boost/boost_%{V_dist}.tar.bz2 @@ -53,6 +55,14 @@ BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc PreReq: OpenPKG, openpkg >= 20040130 +%if "%{with_zlib}" == "yes" +BuildPreReq: zlib +PreReq: zlib +%endif +%if "%{with_bzip2}" == "yes" +BuildPreReq: bzip2 +PreReq: bzip2 +%endif AutoReq: no AutoReqProv: no @@ -91,8 +101,8 @@ ) || exit $? # create build subdirectory, prepare to build -ln -s tools/jam/src/bin.*/bjam bjam -mkdir obj +ln -sf tools/jam/src/bin.*/bjam bjam +%{l_shtool} mkdir -p obj # configure build options for bjam(1) -sBUILD parameter debugopts="release" @@ -109,11 +119,33 @@ %endif # build all libraries -./bjam --toolset=gcc --layout=system --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts" stage +./bjam --toolset=gcc --layout=system --builddir=obj "-sBUILD=$debugopts $optimizeopts $threadopts" \ +%if "%{with_zlib}" == "yes" +"-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include" "-sZLIB_LIBPATH=%{l_prefix}/lib" \ +%else +"-sNOZLIB=1" \ +%endif +%if "%{with_bzip2}" == "yes" +"-sNO_COMPRESSION=0" "-sBZIP2_INCLUDE=%{l_prefix}/include" "-sBZIP2_LIBPATH=%{l_prefix}/lib" \ +%else +"-sNOBZIP2=1" \ +%endif +stage %install rm -rf $RPM_BUILD_ROOT -./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix} install +./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix} \ +%if "%{with_zlib}" == "yes" +"-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include" "-sZLIB_LIBPATH=%{l_prefix}/lib" \ +%else +"-sNOZLIB=1" \ +%endif +%if "%{with_bzip2}" == "yes" +"-sNO_COMPRESSION=0" "-sBZIP2_INCLUDE=%{l_prefix}/include" "-sBZIP2_LIBPATH=%{l_prefix}/lib" \ +%else +"-sNOBZIP2=1" \ +%endif +install rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-* find $RPM_BUILD_ROOT%{l_prefix}/lib/ \ -name "*.so" -print -o \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/monotone/ monotone.patch monotone.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Jun-2007 23:15:45 Branch: HEAD Handle: 2007061722154500 Added files: openpkg-src/monotonemonotone.patch Modified files: openpkg-src/monotonemonotone.spec Log: modifying package: monotone-0.35 20070508 -> 20070617 Summary: RevisionChanges Path 1.5 +12 -0 openpkg-src/monotone/monotone.patch 1.14+3 -1 openpkg-src/monotone/monotone.spec patch -p0 <<'@@ .' Index: openpkg-src/monotone/monotone.patch $ cvs diff -u -r0 -r1.5 monotone.patch --- /dev/null 2007-06-17 23:15:35 +0200 +++ monotone.patch2007-06-17 23:15:45 +0200 @@ -0,0 +1,12 @@ +https://savannah.nongnu.org/bugs/?19984 +Index: numeric_vocab.hh +--- numeric_vocab.hh.orig2007-05-07 16:13:44 +0200 numeric_vocab.hh 2007-06-17 22:50:06 +0200 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include "mt-stdint.h" + #include @@ . patch -p0 <<'@@ .' Index: openpkg-src/monotone/monotone.spec $ cvs diff -u -r1.13 -r1.14 monotone.spec --- openpkg-src/monotone/monotone.spec8 May 2007 07:35:41 - 1.13 +++ openpkg-src/monotone/monotone.spec17 Jun 2007 21:15:45 - 1.14 @@ -33,12 +33,13 @@ Group:SCM License: GPL Version: 0.35 -Release: 20070508 +Release: 20070617 # list of sources Source0: http://monotone.ca/downloads/%{version}/monotone-%{version}.tar.gz Source1: rc.monotone Source3: monotone-setup.sh +Patch0: monotone.patch # build information Prefix: %{l_prefix} @@ -70,6 +71,7 @@ %prep %setup -q +%patch -p0 %build # configure program @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/boost/ boost.patch
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Jun-2007 21:20:10 Branch: HEAD Handle: 2007061720201000 Modified files: openpkg-src/boost boost.patch Log: workaround bjam crashes when compiled with gcc 4.2 Summary: RevisionChanges Path 1.8 +26 -0 openpkg-src/boost/boost.patch patch -p0 <<'@@ .' Index: openpkg-src/boost/boost.patch $ cvs diff -u -r1.7 -r1.8 boost.patch --- openpkg-src/boost/boost.patch 17 Jun 2007 19:18:32 - 1.7 +++ openpkg-src/boost/boost.patch 17 Jun 2007 19:20:10 - 1.8 @@ -17,3 +17,29 @@ } else +Workaround for "bjam crashes when compiled with gcc 4.2" http://svn.boost.org/trac/boost/ticket/977 +Index: tools/jam/src/build.sh +--- tools/jam/src/build.sh.orig 2006-02-03 17:57:42 +0100 tools/jam/src/build.sh 2007-06-17 13:54:31 +0200 +@@ -127,7 +127,7 @@ + ;; + + gcc) +-BOOST_JAM_CC=gcc ++BOOST_JAM_CC="gcc -O0" + ;; + + darwin) +Index: tools/jam/src/build.jam +--- tools/jam/src/build.jam.orig 2007-06-17 14:07:34 +0200 tools/jam/src/build.jam 2007-06-17 14:08:21 +0200 +@@ -153,7 +153,7 @@ + ## GCC 2.x, 3.x, 4.x + toolset gcc gcc : "-o " : -D + : -pedantic +-[ opt --release : [ opt --symbols : -g : -s ] -O3 ] ++[ opt --release : [ opt --symbols : -g : -s ] -O0 ] + [ opt --debug : -g -O0 -fno-inline ] + -I$(--python-include) -Wno-long-long + : -L$(--python-lib[1]) -l$(--python-lib[2]) ; + @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/boost/ boost.patch boost.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Jun-2007 21:18:32 Branch: HEAD Handle: 2007061720183200 Modified files: openpkg-src/boost boost.patch boost.spec Log: upgrading package: boost 1.33.1 -> 1.34.0 Summary: RevisionChanges Path 1.7 +17 -12 openpkg-src/boost/boost.patch 1.13+9 -19 openpkg-src/boost/boost.spec patch -p0 <<'@@ .' Index: openpkg-src/boost/boost.patch $ cvs diff -u -r1.6 -r1.7 boost.patch --- openpkg-src/boost/boost.patch 2 Jul 2006 17:07:42 - 1.6 +++ openpkg-src/boost/boost.patch 17 Jun 2007 19:18:32 - 1.7 @@ -1,14 +1,19 @@ -Index: tools/build/v1/boost-base.jam tools/build/v1/boost-base.jam.orig 2005-07-30 17:55:37 +0200 -+++ tools/build/v1/boost-base.jam2005-08-13 10:22:58 +0200 -@@ -2692,10 +2692,8 @@ - version-tag = $(version-tag:J="_") ; - } - --tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; - tags += $(runtime-tag:J=) ; --tags += $(version-tag) ; +Index: Jamfile.v2 +--- Jamfile.v2.orig 2007-05-11 05:40:34 +0200 Jamfile.v2 2007-06-17 12:43:12 +0200 +@@ -112,12 +112,12 @@ + default-build = + debug release + single multi +-shared static ++static + ; - if $(tags) + if [ os.name ] = NT { +-default-build += shared static ; ++default-build += static ; + } + } + else + @@ . patch -p0 <<'@@ .' Index: openpkg-src/boost/boost.spec $ cvs diff -u -r1.12 -r1.13 boost.spec --- openpkg-src/boost/boost.spec 1 Jan 2007 17:36:53 - 1.12 +++ openpkg-src/boost/boost.spec 17 Jun 2007 19:18:32 - 1.13 @@ -23,8 +23,8 @@ ## # package version -%define V_openpkg1.33.1 -%define V_dist 1_33_1 +%define V_openpkg1.34.0 +%define V_dist 1_34_0 # package information Name: boost @@ -37,7 +37,7 @@ Group:Language License: Boost Software License Version: %{V_openpkg} -Release: 20061013 +Release: 20070617 # package options %option with_debug yes @@ -82,25 +82,16 @@ rm -rf \ libs/python \ boost/python* \ -tools/build/v1/python.jam - -# accommodate platforms missing wide character support -case "%{l_platform -t}" in -*-freebsd4* ) -%{l_shtool} subst \ --e 's;.*boost_wserialization.*;;' \ -libs/serialization/build/Jamfile -;; -esac +tools/build/v2/tools/python.jam %build # bootstrap bjam(1), the boost build system -( cd tools/build/jam_src +( cd tools/jam/src ./build.sh gcc ) || exit $? # create build subdirectory, prepare to build -ln -s tools/build/jam_src/bin.*/bjam bjam +ln -s tools/jam/src/bin.*/bjam bjam mkdir obj # configure build options for bjam(1) -sBUILD parameter @@ -118,12 +109,11 @@ %endif # build all libraries -./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts" stage +./bjam --toolset=gcc --layout=system --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts" stage %install rm -rf $RPM_BUILD_ROOT -./bjam --prefix=$RPM_BUILD_ROOT%{l_prefix} install -mv $RPM_BUILD_ROOT%{l_prefix}/include/boost-*/boost $RPM_BUILD_ROOT%{l_prefix}/include +./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix} install rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-* find $RPM_BUILD_ROOT%{l_prefix}/lib/ \ -name "*.so" -print -o \ @@ -132,7 +122,7 @@ %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin %{l_shtool} install -c -m 755 \ -tools/build/jam_src/bin.*/bjam \ +tools/jam/src/bin.*/bjam \ $RPM_BUILD_ROOT%{l_prefix}/bin/ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ncurses/ ncurses.spec openpkg-src/screen/ s...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 16-Jun-2007 22:05:33 Branch: HEAD Handle: 2007061621053101 Modified files: openpkg-src/ncurses ncurses.spec openpkg-src/screen screen.spec openpkg-src/vim vim.spec Log: bless ncurses for CORE class and make screen and vim use it Summary: RevisionChanges Path 1.327 +3 -3 openpkg-src/ncurses/ncurses.spec 1.54+3 -3 openpkg-src/screen/screen.spec 1.498 +3 -11 openpkg-src/vim/vim.spec patch -p0 <<'@@ .' Index: openpkg-src/ncurses/ncurses.spec $ cvs diff -u -r1.326 -r1.327 ncurses.spec --- openpkg-src/ncurses/ncurses.spec 13 Jun 2007 06:19:56 - 1.326 +++ openpkg-src/ncurses/ncurses.spec 16 Jun 2007 20:05:31 - 1.327 @@ -51,11 +51,11 @@ Vendor: Free Software Foundation Packager: OpenPKG Foundation e.V. Distribution: OpenPKG Community -Class:BASE +Class:CORE Group:Terminal License: MIT-style Version: %{V_base}.%{V_patchL} -Release: 20070613 +Release: 20070616 # list of sources Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz @@ -80,7 +80,7 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, sharutils +BuildPreReq: OpenPKG, openpkg >= 20040130 PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no @@ . patch -p0 <<'@@ .' Index: openpkg-src/screen/screen.spec $ cvs diff -u -r1.53 -r1.54 screen.spec --- openpkg-src/screen/screen.spec23 Apr 2007 09:40:32 - 1.53 +++ openpkg-src/screen/screen.spec16 Jun 2007 20:05:32 - 1.54 @@ -33,7 +33,7 @@ Group:Terminal License: GPL Version: 4.0.3 -Release: 20070423 +Release: 20070616 # list of sources Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz @@ -42,8 +42,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make -PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, ncurses, make +PreReq: OpenPKG, openpkg >= 20040130, ncurses AutoReq: no AutoReqProv: no @@ . patch -p0 <<'@@ .' Index: openpkg-src/vim/vim.spec $ cvs diff -u -r1.497 -r1.498 vim.spec --- openpkg-src/vim/vim.spec 17 May 2007 16:34:16 - 1.497 +++ openpkg-src/vim/vim.spec 16 Jun 2007 20:05:32 - 1.498 @@ -38,7 +38,7 @@ Group:Editor License: Charityware Version: %{V_vl}.%{V_pl} -Release: 20070517 +Release: 20070616 # package options %option with_x11no @@ -60,8 +60,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823 -PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20060823, ncurses +PreReq: OpenPKG, openpkg >= 20060823, ncurses %if "%{with_x11}" == "yes" BuildPreReq: X11, gtk PreReq: X11, gtk @@ -119,14 +119,6 @@ i=`expr $i + 1` done -# reorder the terminal library search to make sure our ncurses is -# not picked up too easily (because we do not want an explicit -# dependency to it because of vim:CORE vs. ncurses:BASE). -%{l_shtool} subst \ --e 's;ncurses termlib termcap curses;termlib termcap ncurses curses;' \ --e 's;\(.*TCL_DEFS=.*sed -e \)\(.\)\(.*\);\1\2/^[^-]/d\2 \2\3;' \ -vim%{V_vs}/src/auto/configure - # adjust introduction text for OpenPKG branding %{l_shtool} subst \ -e 's;Modified by;Packaged by;' \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec openssl.patch
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 16-Jun-2007 00:38:44 Branch: HEAD Handle: 2007061523384301 Modified files: openpkg-src/openpkg HISTORY openpkg.spec openssl.patch Log: teach OpenSSL config to identify cc being a disguised gcc (pass -gcc to Configure but run cc) Summary: RevisionChanges Path 1.463 +1 -0 openpkg-src/openpkg/HISTORY 1.598 +1 -1 openpkg-src/openpkg/openpkg.spec 1.7 +292 -8 openpkg-src/openpkg/openssl.patch patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.462 -r1.463 HISTORY --- openpkg-src/openpkg/HISTORY 15 Jun 2007 14:30:23 - 1.462 +++ openpkg-src/openpkg/HISTORY 15 Jun 2007 22:38:43 - 1.463 @@ -2,6 +2,7 @@ 2007 +20070616 teach OpenSSL config to identify cc being a disguised gcc (pass -gcc to Configure but run cc) 20070614 synchronize 64bit -fPIC option and ./config usage from "openssl" package 20070608 upgrade to GNU tar 1.17 20070608 fix tracking of gzip @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.597 -r1.598 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 15 Jun 2007 14:30:23 - 1.597 +++ openpkg-src/openpkg/openpkg.spec 15 Jun 2007 22:38:43 - 1.598 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070615 +%define V_openpkg 20070616 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openssl.patch $ cvs diff -u -r1.6 -r1.7 openssl.patch --- openpkg-src/openpkg/openssl.patch 3 Jun 2007 21:09:28 - 1.6 +++ openpkg-src/openpkg/openssl.patch 15 Jun 2007 22:38:44 - 1.7 @@ -42,9 +42,65 @@ my @pwd_path = split(/[\\\/]/, $pwd); Index: config config.orig 2005-09-20 14:16:30 +0200 -+++ config 2006-04-07 19:17:06 +0200 -@@ -469,6 +469,7 @@ +--- config.orig 2007-02-22 03:00:39.0 +0100 config 2007-06-16 00:06:32.527799000 +0200 +@@ -401,9 +401,9 @@ + + # figure out if gcc is available and if so we use it otherwise + # we fallback to whatever cc does on the system +-GCCVER=`(gcc -dumpversion) 2>/dev/null` ++GCCVER=`(gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )` + if [ "$GCCVER" != "" ]; then +- CC=gcc ++ CC=cc; gcc -dumpversion >/dev/null 2>&1 && CC=gcc + # then strip off whatever prefix egcs prepends the number with... + # Hopefully, this will work for any future prefixes as well. + GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'` +@@ -412,8 +412,10 @@ + # major and minor version numbers. + # peak single digit before and after first dot, e.g. 2.95.1 gives 29 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` ++ SUFFIX=gcc + else + CC=cc ++ SUFFIX=cc + fi + GCCVER=${GCCVER:-0} + if [ "$SYSTEM" = "HP-UX" ];then +@@ -422,7 +424,7 @@ + if [ $GCCVER -ge 30 ]; then + # PA64 support only came in with gcc 3.0.x. + # We check if the preprocessor symbol __LP64__ is defined... +-if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then ++if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then + : # __LP64__ has slipped through, it therefore is not defined + else + GCC_BITS="64" +@@ -433,13 +435,14 @@ + if [ $GCCVER -ge 30 ]; then + # 64-bit ABI isn't officially supported in gcc 3.0, but it appears + # to be working, at the very least 'make test' passes... +-if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then ++if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then + GCC_ARCH="-m64" + else + GCC_ARCH="-m32" + fi + fi + # check for WorkShop C, expected output is "cc:
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 15-Jun-2007 16:30:23 Branch: HEAD Handle: 2007061515302300 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: fix curl run-time failure when attempting HTTPS transfers on amd64 Summary: RevisionChanges Path 1.462 +1 -0 openpkg-src/openpkg/HISTORY 1.597 +7 -2 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.461 -r1.462 HISTORY --- openpkg-src/openpkg/HISTORY 8 Jun 2007 17:16:31 - 1.461 +++ openpkg-src/openpkg/HISTORY 15 Jun 2007 14:30:23 - 1.462 @@ -2,6 +2,7 @@ 2007 +20070614 synchronize 64bit -fPIC option and ./config usage from "openssl" package 20070608 upgrade to GNU tar 1.17 20070608 fix tracking of gzip 20070607 use path /etc/rc.d/init.d/ instead of non-standard /etc/init.d/ under AIX @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.596 -r1.597 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 8 Jun 2007 17:16:31 - 1.596 +++ openpkg-src/openpkg/openpkg.spec 15 Jun 2007 14:30:23 - 1.597 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070608 +%define V_openpkg 20070615 # the used software versions %define V_rpm 4.2.1 @@ -827,9 +827,14 @@ case $plid in SunOS/* ) opts="-lnsl -lsocket" ;; esac + case `sh $shtool platform -n -L -S "" -C "+" -F "%-%"` in + amd64-* ) opts="$opts -fPIC" ;; + ia64-* ) opts="$opts -fPIC" ;; + sparc64-freebsd* ) opts="$opts -fPIC" ;; + esac CC="${l_cc}" \ PERL="${l_perl}" \ - $l_perl ./Configure cc \ + ./config \ --prefix=%{l_prefix} \ no-asm no-shared no-dso \ no-zlib no-idea no-threads no-krb5 no-hw \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/aalib/ aalib.patch aalib.spec openpkg-src/a...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Jun-2007 18:22:25 Branch: HEAD Handle: 200706111703 Added files: openpkg-src/audiofile audiofile.patch openpkg-src/gdk-pixbuf gdk-pixbuf.patch openpkg-src/gtk gtk.patch openpkg-src/imlib imlib.patch Modified files: openpkg-src/aalib aalib.patch aalib.spec openpkg-src/audiofile audiofile.spec openpkg-src/gdk-pixbuf gdk-pixbuf.spec openpkg-src/glibglib.patch glib.spec openpkg-src/gtk gtk.spec openpkg-src/imlib imlib.spec openpkg-src/orbit orbit.patch orbit.spec openpkg-src/xdelta xdelta.patch xdelta.spec Log: defeat aclocal underquoted definition warning Summary: RevisionChanges Path 1.4 +14 -0 openpkg-src/aalib/aalib.patch 1.15+1 -1 openpkg-src/aalib/aalib.spec 1.1 +13 -0 openpkg-src/audiofile/audiofile.patch 1.25+3 -1 openpkg-src/audiofile/audiofile.spec 1.1 +13 -0 openpkg-src/gdk-pixbuf/gdk-pixbuf.patch 1.36+3 -1 openpkg-src/gdk-pixbuf/gdk-pixbuf.spec 1.2 +14 -0 openpkg-src/glib/glib.patch 1.39+1 -1 openpkg-src/glib/glib.spec 1.1 +13 -0 openpkg-src/gtk/gtk.patch 1.40+3 -1 openpkg-src/gtk/gtk.spec 1.1 +22 -0 openpkg-src/imlib/imlib.patch 1.43+3 -1 openpkg-src/imlib/imlib.spec 1.2 +26 -0 openpkg-src/orbit/orbit.patch 1.49+1 -1 openpkg-src/orbit/orbit.spec 1.2 +13 -0 openpkg-src/xdelta/xdelta.patch 1.46+1 -1 openpkg-src/xdelta/xdelta.spec patch -p0 <<'@@ .' Index: openpkg-src/aalib/aalib.patch $ cvs diff -u -r1.3 -r1.4 aalib.patch --- openpkg-src/aalib/aalib.patch 3 May 2005 14:33:02 - 1.3 +++ openpkg-src/aalib/aalib.patch 11 Jun 2007 16:22:25 - 1.4 @@ -144,3 +144,17 @@ LIBS="$LIBS -L$withval/lib -lgpm" cat >> confdefs.h <<\EOF #define GPM_MOUSEDRIVER 1 + +Index: aalib.m4 +--- aalib.m4.orig2001-04-26 16:37:31 +0200 aalib.m4 2007-06-11 18:05:51 +0200 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl + @@ . patch -p0 <<'@@ .' Index: openpkg-src/aalib/aalib.spec $ cvs diff -u -r1.14 -r1.15 aalib.spec --- openpkg-src/aalib/aalib.spec 1 Jan 2007 17:36:26 - 1.14 +++ openpkg-src/aalib/aalib.spec 11 Jun 2007 16:22:25 - 1.15 @@ -37,7 +37,7 @@ Group:Graphics License: LGPL Version: %{V_dist} -Release: 20061013 +Release: 20070611 # list of sources Source0: http://switch.dl.sourceforge.net/aa-project/aalib-%{version}.tar.gz @@ . patch -p0 <<'@@ .' Index: openpkg-src/audiofile/audiofile.patch $ cvs diff -u -r0 -r1.1 audiofile.patch --- /dev/null 2007-06-11 18:22:00 +0200 +++ audiofile.patch 2007-06-11 18:22:24 +0200 @@ -0,0 +1,13 @@ +Index: audiofile.m4 +--- audiofile.m4.orig2004-03-06 07:39:23 +0100 audiofile.m4 2007-06-11 17:39:30 +0200 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. + dnl +-AC_DEFUN(AM_PATH_AUDIOFILE, ++AC_DEFUN([AM_PATH_AUDIOFILE], + [dnl + dnl Get compiler flags and libraries from the audiofile-config script. + dnl + @@ . patch -p0 <<'@@ .' Index: openpkg-src/audiofile/audiofile.spec $ cvs diff -u -r1.24 -r1.25 audiofile.spec --- openpkg-src/audiofile/audiofile.spec 1 Jan 2007 17:36:41 - 1.24 +++ openpkg-src/audiofile/audiofile.spec 11 Jun 2007 16:22:23 - 1.25 @@ -33,10 +33,11 @@ Group:Audio License: LGPL Version: 0.2.6 -Release: 2006
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Jun-2007 16:11:50 Branch: HEAD Handle: 2007061115115000 Modified files: openpkg-src/gcc gcc.spec Log: avoid hang in GNU ld/as detection when non-GNU utility reads from stdin (one more time) Summary: RevisionChanges Path 1.144 +2 -2 openpkg-src/gcc/gcc.spec patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.143 -r1.144 gcc.spec --- openpkg-src/gcc/gcc.spec 8 Jun 2007 14:16:17 - 1.143 +++ openpkg-src/gcc/gcc.spec 11 Jun 2007 14:11:50 - 1.144 @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20070608 +Release: 20070611 # package options %option with_cxx yes @@ -192,7 +192,7 @@ l_libcxxflags="-g" # at least GNU as from GNU binutils supports -pipe always AS="%{l_tool_locate as as}" -"$AS" --version 2>/dev/null | grep "^GNU assembler " >/dev/null && { +"$AS" --version /dev/null | grep "^GNU assembler " >/dev/null && { l_boot_cflags="$l_boot_cflags -pipe"; l_libcxxflags="$l_libcxxflags -pipe"; } @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Jun-2007 16:16:17 Branch: HEAD Handle: 2007060815161700 Modified files: openpkg-src/gcc gcc.spec Log: avoid hang in GNU ld/as detection when non-GNU utility reads from stdin (Mac OS X) Summary: RevisionChanges Path 1.143 +3 -3 openpkg-src/gcc/gcc.spec patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.142 -r1.143 gcc.spec --- openpkg-src/gcc/gcc.spec 5 Jun 2007 17:01:27 - 1.142 +++ openpkg-src/gcc/gcc.spec 8 Jun 2007 14:16:17 - 1.143 @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20070605 +Release: 20070608 # package options %option with_cxx yes @@ -119,8 +119,8 @@ AS="%{l_tool_locate as as}" echo "$LD" | grep "^/" >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-ld=\"$LD\"" echo "$AS" | grep "^/" >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-as=\"$AS\"" -"$LD" --version 2>/dev/null | grep "^GNU ld ">/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld" -"$AS" --version 2>/dev/null | grep "^GNU assembler " >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as" +"$LD" --version /dev/null | grep "^GNU ld " >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld" +"$AS" --version /dev/null | grep "^GNU assembler " >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as" # determine threads usage %if "%{with_threads}" == "yes" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Jun-2007 16:10:44 Branch: HEAD Handle: 2007060815104300 Modified files: openpkg-src/apache2 apache2.spec Log: configure option for LDAP based authentication was renamed Summary: RevisionChanges Path 1.90+2 -2 openpkg-src/apache2/apache2.spec patch -p0 <<'@@ .' Index: openpkg-src/apache2/apache2.spec $ cvs diff -u -r1.89 -r1.90 apache2.spec --- openpkg-src/apache2/apache2.spec 6 Jun 2007 13:05:52 - 1.89 +++ openpkg-src/apache2/apache2.spec 8 Jun 2007 14:10:43 - 1.90 @@ -33,7 +33,7 @@ Group:Web License: ASF Version: 2.2.4 -Release: 20070606 +Release: 20070608 # package options (generic) %option with_mpm prefork @@ -186,7 +186,7 @@ %endif %if "%{with_mod_ldap}" == "yes" --enable-ldap \ - --enable-auth-ldap \ + --enable-authnz-ldap \ --with-ldap \ --with-ldap-include=%{l_prefix}/include/ \ --with-ldap-lib=%{l_prefix}/lib \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/amavisd/ amavisd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Jun-2007 15:39:49 Branch: HEAD Handle: 2007060814394900 Modified files: openpkg-src/amavisd amavisd.spec Log: make sure amavisd picks up our file(1) Summary: RevisionChanges Path 1.77+2 -2 openpkg-src/amavisd/amavisd.spec patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.spec $ cvs diff -u -r1.76 -r1.77 amavisd.spec --- openpkg-src/amavisd/amavisd.spec 6 Jun 2007 21:36:01 - 1.76 +++ openpkg-src/amavisd/amavisd.spec 8 Jun 2007 13:39:49 - 1.77 @@ -37,7 +37,7 @@ Group:Mail License: GPL Version: %{V_amavis} -Release: 20070606 +Release: 20070608 # package options %option with_milter no @@ -52,7 +52,7 @@ Prefix: %{l_prefix} BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, sed -PreReq: OpenPKG, openpkg >= 20060823, spamassassin +PreReq: OpenPKG, openpkg >= 20060823, spamassassin, file PreReq: perl, perl-net, perl-util, perl-mail, perl-time PreReq: perl-sys, perl-comp, perl-conv %if "%{with_milter}" == "yes" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/amavisd/ amavisd.patch amavisd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Jun-2007 23:36:01 Branch: HEAD Handle: 2007060622360100 Modified files: openpkg-src/amavisd amavisd.patch amavisd.spec Log: modifying package: amavisd-2.5.1 20070531 -> 20070606 Summary: RevisionChanges Path 1.5 +18 -0 openpkg-src/amavisd/amavisd.patch 1.76+1 -1 openpkg-src/amavisd/amavisd.spec patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.patch $ cvs diff -u -r1.4 -r1.5 amavisd.patch --- openpkg-src/amavisd/amavisd.patch 30 Dec 2006 16:14:55 - 1.4 +++ openpkg-src/amavisd/amavisd.patch 6 Jun 2007 21:36:01 - 1.5 @@ -153,3 +153,21 @@ /* smfi_settimeout(1800); */ /* defaults to 7210 seconds */ +https://intevation.de/roundup/kolab/merge32 "amavisd inserts subject tag more than once" +https://intevation.de/roundup/kolab/file543/amavisd-new-2.5.1-last_subject_tag_only.patch +diff -urN amavisd.orig amavisd +--- amavisd.orig 2007-05-31 14:10:01.0 +0200 amavisd 2007-06-06 16:33:54.0 +0200 +@@ -9854,7 +9854,10 @@ + if ($subject_tag ne '') { + if (defined $msginfo->orig_header_fields->{'subject'}) { + $hdr_edits->edit_header('Subject', +-sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_tag.$2 }); ++sub { $_[1]=~/^([ \t]?)(.*)\z/s; ++ my $subj = $2; ++ $subj=~s/\Q$subject_tag\E//sg; ++ ' '.$subject_tag.$subj }); + } else { # no Subject header field present, insert one + $subject_tag =~ s/[ \t]+\z//; # trim + $hdr_edits->append_header('Subject', $subject_tag); + @@ . patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.spec $ cvs diff -u -r1.75 -r1.76 amavisd.spec --- openpkg-src/amavisd/amavisd.spec 31 May 2007 14:48:55 - 1.75 +++ openpkg-src/amavisd/amavisd.spec 6 Jun 2007 21:36:01 - 1.76 @@ -37,7 +37,7 @@ Group:Mail License: GPL Version: %{V_amavis} -Release: 20070531 +Release: 20070606 # package options %option with_milter no @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache2-php/ apache2-php.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Jun-2007 11:53:32 Branch: HEAD Handle: 2007060110533100 Modified files: openpkg-src/apache2-php apache2-php.spec Log: upgrading package: apache2-php 5.2.2 -> 5.2.3 Summary: RevisionChanges Path 1.4 +2 -2 openpkg-src/apache2-php/apache2-php.spec patch -p0 <<'@@ .' Index: openpkg-src/apache2-php/apache2-php.spec $ cvs diff -u -r1.3 -r1.4 apache2-php.spec --- openpkg-src/apache2-php/apache2-php.spec 31 May 2007 13:23:00 - 1.3 +++ openpkg-src/apache2-php/apache2-php.spec 1 Jun 2007 09:53:31 - 1.4 @@ -23,7 +23,7 @@ ## # package versions -%define V_php 5.2.2 +%define V_php 5.2.3 %define V_php_suhosin_p 5.2.2-0.9.6.2 %define V_php_suhosin_e 0.9.20 %define V_php_hardened5.1.6-0.4.15 @@ -39,7 +39,7 @@ Group:Language License: PHP Version: %{V_php} -Release: 20070531 +Release: 20070601 # package options %option with_suhosin no @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Jun-2007 11:52:58 Branch: HEAD Handle: 2007060110525700 Modified files: openpkg-src/apache apache.spec Log: modifying package: apache-1.3.37 20070520 -> 20070601 Summary: RevisionChanges Path 1.404 +2 -2 openpkg-src/apache/apache.spec patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.403 -r1.404 apache.spec --- openpkg-src/apache/apache.spec20 May 2007 07:05:30 - 1.403 +++ openpkg-src/apache/apache.spec1 Jun 2007 09:52:57 - 1.404 @@ -46,7 +46,7 @@ %define V_mod_layout 3.4 %define V_mod_macro 1.1.2 %define V_mod_perl 1.30 -%define V_mod_php5.2.2 +%define V_mod_php5.2.3 %define V_mod_php_hardened 5.1.6-0.4.15 %define V_mod_php_suhosin_e 0.9.20 %define V_mod_php_suhosin_p 5.2.2-0.9.6.2 @@ -68,7 +68,7 @@ Group:Web License: ASF Version: %{V_apache} -Release: 20070520 +Release: 20070601 # package options (Apache core related) %option with_hard_server_limit256 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Jun-2007 11:52:00 Branch: HEAD Handle: 200706011052 Modified files: openpkg-src/php php.spec Log: upgrading package: php 5.2.2 -> 5.2.3 Summary: RevisionChanges Path 1.155 +3 -3 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.154 -r1.155 php.spec --- openpkg-src/php/php.spec 31 May 2007 13:23:00 - 1.154 +++ openpkg-src/php/php.spec 1 Jun 2007 09:52:00 - 1.155 @@ -23,7 +23,7 @@ ## # package versions -%define V_php 5.2.2 +%define V_php 5.2.3 %define V_php_suhosin_p 5.2.2-0.9.6.2 %define V_php_suhosin_e 0.9.20 %define V_php_hardened5.1.6-0.4.15 @@ -39,7 +39,7 @@ Group:Language License: PHP Version: %{V_php} -Release: 20070531 +Release: 20070601 # package options %option with_suhosin no @@ -532,7 +532,7 @@ %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/cgi %{l_shtool} install -c -s -m 755 \ -sapi/cgi/php $RPM_BUILD_ROOT%{l_prefix}/cgi/ +sapi/cgi/php-cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/ # install default configuration file %{l_shtool} mkdir -f -p -m 755 \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 18:43:31 Branch: HEAD Handle: 2007053117433100 Modified files: openpkg-src/wordpress wordpress.spec Log: modifying package: wordpress-2.2 20070517 -> 20070531 Summary: RevisionChanges Path 1.41+10 -10 openpkg-src/wordpress/wordpress.spec patch -p0 <<'@@ .' Index: openpkg-src/wordpress/wordpress.spec $ cvs diff -u -r1.40 -r1.41 wordpress.spec --- openpkg-src/wordpress/wordpress.spec 17 May 2007 08:54:32 - 1.40 +++ openpkg-src/wordpress/wordpress.spec 31 May 2007 16:43:31 - 1.41 @@ -25,14 +25,14 @@ # package versions %define V_wordpress2.2 %define V_plugin_simpletagging 1-6 -%define V_plugin_dbmanager 210 -%define V_plugin_pagenavi 210 -%define V_plugin_polls 214 -%define V_plugin_postviews 110 -%define V_plugin_print 210 -%define V_plugin_relativedate 110 -%define V_plugin_stats 210 -%define V_plugin_ban 110 +%define V_plugin_dbmanager 211 +%define V_plugin_pagenavi 211 +%define V_plugin_polls 220 +%define V_plugin_postviews 111 +%define V_plugin_print 211 +%define V_plugin_relativedate 111 +%define V_plugin_stats 211 +%define V_plugin_ban 111 %define V_plugin_ela 0.10 # package information @@ -46,7 +46,7 @@ Group:CMS License: GPL Version: %{V_wordpress} -Release: 20070517 +Release: 20070531 # list of sources Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz @@ -170,7 +170,7 @@ -e 's;putyourdbnamehere;wordpress;g' \ -e 's;wordpresshere;wordpress;g' \ -e 's;yourwordpresshere;wordpress;g' \ -wordpress/wp-config.php +wordpress/wp-config-sample.php wordpress/wp-config.php %install # create installation hierarchy @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 18:09:53 Branch: HEAD Handle: 2007053117095300 Modified files: openpkg-src/clamav clamav.spec Log: upgrading package: clamav 0.90.2 -> 0.90.3 Summary: RevisionChanges Path 1.85+1 -1 openpkg-src/clamav/clamav.spec patch -p0 <<'@@ .' Index: openpkg-src/clamav/clamav.spec $ cvs diff -u -r1.84 -r1.85 clamav.spec --- openpkg-src/clamav/clamav.spec31 May 2007 06:16:16 - 1.84 +++ openpkg-src/clamav/clamav.spec31 May 2007 16:09:53 - 1.85 @@ -32,7 +32,7 @@ Class:EVAL Group:AntiVirus License: GPL -Version: 0.90.2 +Version: 0.90.3 Release: 20070531 # package options @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/io/ io.patch io.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 18:07:52 Branch: HEAD Handle: 2007053117075200 Modified files: openpkg-src/io io.spec Removed files: openpkg-src/io io.patch Log: upgrading package: io 20070430 -> 20070528 Summary: RevisionChanges Path 1.3 +0 -13 openpkg-src/io/io.patch 1.9 +3 -5 openpkg-src/io/io.spec rm -f openpkg-src/io/io.patch <<'@@ .' Index: openpkg-src/io/io.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: openpkg-src/io/io.spec $ cvs diff -u -r1.8 -r1.9 io.spec --- openpkg-src/io/io.spec7 May 2007 16:43:51 - 1.8 +++ openpkg-src/io/io.spec31 May 2007 16:07:52 - 1.9 @@ -23,8 +23,8 @@ ## # package version -%define V_opkg 20070430 -%define V_dist 2007-04-30 +%define V_opkg 20070528 +%define V_dist 2007-05-28 # package information Name: io @@ -37,7 +37,7 @@ Group:Language License: BSD Version: %{V_opkg} -Release: 20070507 +Release: 20070531 # package options %option with_threads no @@ -47,7 +47,6 @@ # list of sources Source0: http://io.urbanape.com/release/Io-%{V_dist}.zip -Patch0: io.patch # build information Prefix: %{l_prefix} @@ -86,7 +85,6 @@ %prep %setup -q -T -c %{l_prefix}/bin/unzip -q -x %{SOURCE0} -%patch -p0 -d Io-%{V_dist} %build # prepare addon directory @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/postfix/ postfix.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:58:50 Branch: HEAD Handle: 2007053116585000 Modified files: openpkg-src/postfix postfix.spec Log: upgrading package: postfix 2.4.1 -> 2.4.2 Summary: RevisionChanges Path 1.258 +2 -2 openpkg-src/postfix/postfix.spec patch -p0 <<'@@ .' Index: openpkg-src/postfix/postfix.spec $ cvs diff -u -r1.257 -r1.258 postfix.spec --- openpkg-src/postfix/postfix.spec 24 Apr 2007 07:48:39 - 1.257 +++ openpkg-src/postfix/postfix.spec 31 May 2007 15:58:50 - 1.258 @@ -23,7 +23,7 @@ ## # package versions -%define V_postfix 2.4.1 +%define V_postfix 2.4.2 %define V_pflogsumm1.1.1 %define V_whoson 2.4.0 @@ -38,7 +38,7 @@ Group:Mail License: IPL Version: %{V_postfix} -Release: 20070424 +Release: 20070531 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/findutils/ findutils.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:56:47 Branch: HEAD Handle: 2007053116564700 Modified files: openpkg-src/findutils findutils.spec Log: upgrading package: findutils 4.2.30 -> 4.2.31 Summary: RevisionChanges Path 1.82+2 -2 openpkg-src/findutils/findutils.spec patch -p0 <<'@@ .' Index: openpkg-src/findutils/findutils.spec $ cvs diff -u -r1.81 -r1.82 findutils.spec --- openpkg-src/findutils/findutils.spec 28 Feb 2007 17:08:53 - 1.81 +++ openpkg-src/findutils/findutils.spec 31 May 2007 15:56:47 - 1.82 @@ -32,8 +32,8 @@ Class:BASE Group:ShellUtils License: GPL -Version: 4.2.30 -Release: 20070228 +Version: 4.2.31 +Release: 20070531 # list of sources Source0: ftp://ftp.gnu.org/gnu/findutils/findutils-%{version}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libidn/ libidn.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:52:51 Branch: HEAD Handle: 2007053116525000 Modified files: openpkg-src/libidn libidn.spec Log: upgrading package: libidn 0.6.12 -> 0.6.14 Summary: RevisionChanges Path 1.43+5 -3 openpkg-src/libidn/libidn.spec patch -p0 <<'@@ .' Index: openpkg-src/libidn/libidn.spec $ cvs diff -u -r1.42 -r1.43 libidn.spec --- openpkg-src/libidn/libidn.spec25 Apr 2007 15:20:21 - 1.42 +++ openpkg-src/libidn/libidn.spec31 May 2007 15:52:50 - 1.43 @@ -32,8 +32,8 @@ Class:BASE Group:DNS License: LGPL -Version: 0.6.12 -Release: 20070425 +Version: 0.6.14 +Release: 20070531 # list of sources Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -87,6 +87,9 @@ %{l_shtool} subst \ -e 's;^\(#if \)\(@[EMAIL PROTECTED])\( && ! defined __BIT_TYPES_DEFINED__.*\)$;\1(\2+0)\3;' \ lib/gl/stdint_.h +%{l_shtool} subst \ +-e 's;string.h $(WCHAR_H);string.h stdint.h $(WCHAR_H);' \ +lib/gl/Makefile.in %build CC="%{l_cc}" \ @@ -101,7 +104,6 @@ --with-libiconv-prefix=%{l_prefix} \ --disable-shared \ --disable-nls -./config.status --file=lib/gl/stdint.h:lib/gl/stdint_.h %{l_make} %{l_mflags -O} %install @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mtools/ mtools.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:11:42 Branch: HEAD Handle: 2007053116114200 Modified files: openpkg-src/mtools mtools.spec Log: upgrading package: mtools 3.9.10 -> 3.9.11 Summary: RevisionChanges Path 1.46+4 -6 openpkg-src/mtools/mtools.spec patch -p0 <<'@@ .' Index: openpkg-src/mtools/mtools.spec $ cvs diff -u -r1.45 -r1.46 mtools.spec --- openpkg-src/mtools/mtools.spec11 Apr 2007 15:44:35 - 1.45 +++ openpkg-src/mtools/mtools.spec31 May 2007 15:11:42 - 1.46 @@ -23,7 +23,7 @@ ## # package version -%define V_base 3.9.10 +%define V_base 3.9.11 %define V_patch 20070411 # package information @@ -37,12 +37,11 @@ Group:Filesystem License: GPL Version: %{V_base} -Release: 20070411 +Release: 20070531 # list of sources Source0: http://mtools.linux.lu/mtools-%{V_base}.tar.gz -Patch0: http://mtools.linux.lu/mtools-%{V_base}-%{V_patch}.diff.gz -Patch1: mtools.patch +Patch0: mtools.patch # build information Prefix: %{l_prefix} @@ -72,8 +71,7 @@ %prep %setup -q -%patch -p1 -P 0 -%patch -p0 -P 1 +%patch -p0 %build CC="%{l_cc}" \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/crossroads/ crossroads.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:06:51 Branch: HEAD Handle: 2007053116065100 Modified files: openpkg-src/crossroads crossroads.spec Log: upgrading package: crossroads 1.42 -> 1.43 Summary: RevisionChanges Path 1.45+2 -2 openpkg-src/crossroads/crossroads.spec patch -p0 <<'@@ .' Index: openpkg-src/crossroads/crossroads.spec $ cvs diff -u -r1.44 -r1.45 crossroads.spec --- openpkg-src/crossroads/crossroads.spec21 May 2007 17:42:46 - 1.44 +++ openpkg-src/crossroads/crossroads.spec31 May 2007 15:06:51 - 1.45 @@ -32,8 +32,8 @@ Class:EVAL Group:Network License: Open Source -Version: 1.42 -Release: 20070521 +Version: 1.43 +Release: 20070531 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fribidi/ fribidi.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 17:01:27 Branch: HEAD Handle: 2007053116012600 Modified files: openpkg-src/fribidi fribidi.spec Log: upgrading package: fribidi 0.10.7 -> 0.10.8 Summary: RevisionChanges Path 1.15+2 -2 openpkg-src/fribidi/fribidi.spec patch -p0 <<'@@ .' Index: openpkg-src/fribidi/fribidi.spec $ cvs diff -u -r1.14 -r1.15 fribidi.spec --- openpkg-src/fribidi/fribidi.spec 1 Jan 2007 17:37:56 - 1.14 +++ openpkg-src/fribidi/fribidi.spec 31 May 2007 15:01:26 - 1.15 @@ -32,8 +32,8 @@ Class:PLUS Group:Charset License: LGPL -Version: 0.10.7 -Release: 20061013 +Version: 0.10.8 +Release: 20070531 # list of sources Source0: http://fribidi.org/download/fribidi-%{version}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/amavisd/ amavisd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 16:48:57 Branch: HEAD Handle: 2007053115485500 Modified files: openpkg-src/amavisd amavisd.spec Log: upgrading package: amavisd 2.5.0 -> 2.5.1 Summary: RevisionChanges Path 1.75+2 -2 openpkg-src/amavisd/amavisd.spec patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.spec $ cvs diff -u -r1.74 -r1.75 amavisd.spec --- openpkg-src/amavisd/amavisd.spec 23 Apr 2007 16:10:26 - 1.74 +++ openpkg-src/amavisd/amavisd.spec 31 May 2007 14:48:55 - 1.75 @@ -23,7 +23,7 @@ ## # package versions -%define V_amavis 2.5.0 +%define V_amavis 2.5.1 %define V_logsumm 0.6 # package information @@ -37,7 +37,7 @@ Group:Mail License: GPL Version: %{V_amavis} -Release: 20070423 +Release: 20070531 # package options %option with_milter no @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 15:27:45 Branch: HEAD Handle: 2007053114274500 Modified files: openpkg-src/imapd imapd.spec Log: IMAP METADATA Extension and other requirements for Kolab; packaging work motivated by the Kolab-Konsortium Summary: RevisionChanges Path 1.174 +68 -8 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.173 -r1.174 imapd.spec --- openpkg-src/imapd/imapd.spec 6 May 2007 22:17:10 - 1.173 +++ openpkg-src/imapd/imapd.spec 31 May 2007 13:27:45 - 1.174 @@ -33,17 +33,32 @@ Group:Mail License: BSD Version: 2.3.8 -Release: 20070507 +Release: 20070531 # package options %option with_fsl yes %option with_group no +%option with_group_igncase no %option with_atvdomno %option with_drac no %option with_replication no %option with_murderno %option with_listext no %option with_nntp no +%option with_ldap no +%option with_annotate no +%option with_morelogging no +%option with_kolab no + +# fixing implicit inter-module dependencies and correlations +%if "%{with_kolab}" == "yes" +%undefine with_group_igncase +%undefine with_ldap +%undefine with_annotate +%define with_group_igncase yes +%define with_ldap yes +%define with_annotate yes +%endif # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -53,6 +68,11 @@ Source4: fsl.imapd Patch0: imapd.patch Patch1: imapd.patch.group +Patch2: http://vman.de/cyrus/TV-annotation-definitions.diff +Patch3: http://projects.pardus.de/kolab/browser/ebuilds-2.1/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.3.7-cyradm.patch?format=raw +Patch4: http://projects.pardus.de/kolab/browser/ebuilds-2.1/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-morelogging.patch?format=raw +Patch5: http://projects.pardus.de/kolab/browser/ebuilds-2.1/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-kolab.patch?format=raw +Patch6: http://projects.pardus.de/kolab/browser/ebuilds-2.1/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.7-goodchars.patch?format=raw # build information Prefix: %{l_prefix} @@ -65,6 +85,10 @@ BuildPreReq: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 %endif +%if "%{with_ldap}" == "yes" +BuildPreReq: openldap >= 2.2.14 +PreReq: openldap >= 2.2.14 +%endif %if "%{with_drac}" == "yes" BuildPreReq: drac PreReq: drac @@ -94,23 +118,49 @@ # upgrade config scripts for better platform support %{l_prefix}/bin/config install -# add optional group file support +# add optional group file support with support to ignore case %if "%{with_group}" == "yes" -%patch -p0 -P 1 +cp %{PATCH imapd.patch.group} imapd.patch.group +%if "%{with_group_igncase}" == "yes" +%{l_shtool} subst -e 's;^\(\+.*\)strcmp;\1strcasecmp;' imapd.patch.group +%endif +%{l_patch} -p0 /dev/null 2>&1 || true + # ensure local et/com_err can be found %{l_shtool} subst -s \ -e 's;#include ;#include "et/com_err.h";' \ @@ -118,10 +168,11 @@ sieve/sieve_err.h config.h.in configure # fix Berkeley-DB detection -%{l_shtool} subst \ +%{l_shtool} subst\ -e 's;-L/usr/local/lib;;g' \ -e 's;-I/usr/local/include;;g' \ --e 's;db-4.4;db;g' \ +-e 's;db-4\.[0-9];db;g' \ +-e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \ configure # ensure correct linking of Berkeley-DB in perl bindings @@ -167,6 +218,12 @@ -e '/alt_config/s;"deliver";"cyrdeliver";' \ imap/deliver.c +# avoid name clash with postfix +%{l_shtool} subst \ +-e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
[CVS] OpenPKG: openpkg-src/apache2-php/ apache2-php.spec openpkg-src/i...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-May-2007 15:23:01 Branch: HEAD Handle: 2007053114225901 Added files: openpkg-src/imapimap.patch.annotate Modified files: openpkg-src/apache2-php apache2-php.spec openpkg-src/imapimap.spec openpkg-src/php php.spec Log: IMAP METADATA Extension; packaging work motivated by the Kolab-Konsortium Summary: RevisionChanges Path 1.3 +10 -1 openpkg-src/apache2-php/apache2-php.spec 1.1 +453 -0 openpkg-src/imap/imap.patch.annotate 1.57+6 -1 openpkg-src/imap/imap.spec 1.154 +10 -1 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/apache2-php/apache2-php.spec $ cvs diff -u -r1.2 -r1.3 apache2-php.spec --- openpkg-src/apache2-php/apache2-php.spec 30 May 2007 17:27:37 - 1.2 +++ openpkg-src/apache2-php/apache2-php.spec 31 May 2007 13:23:00 - 1.3 @@ -39,7 +39,7 @@ Group:Language License: PHP Version: %{V_php} -Release: 20070530 +Release: 20070531 # package options %option with_suhosin no @@ -60,6 +60,7 @@ %option with_gettext no %option with_iconvno %option with_imap no +%option with_imap_annotateno %option with_mbregex no %option with_mbstring no %option with_mcrypt no @@ -115,6 +116,7 @@ Source3: php.conf Patch0: http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz Patch1: http://www.hardened-php.net/suhosin/_media/suhosin-patch-%{V_php_suhosin_p}.patch.gz +Patch2: http://projects.pardus.de/kolab/browser/ebuilds-2.1/dev-lang/php/files/php-5.2.2-kolab.patch?format=raw # build information Prefix: %{l_prefix} @@ -193,6 +195,10 @@ BuildPreReq: imap, openssl PreReq: imap, openssl %endif +%if "%{with_imap_annotate}" == "yes" +BuildPreReq: imap::with_annotate = yes +PreReq: imap::with_annotate = yes +%endif %if "%{with_xml}" == "yes" BuildPreReq: libxml PreReq: libxml @@ -299,6 +305,9 @@ -e 's;\(/include\)/freetype2;\1;' \ configure \ ext/gd/config.m4 +%if "%{with_imap_annotate}" == "yes" +sed <%{PATCH2} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1 +%endif %build # configure package @@ . patch -p0 <<'@@ .' Index: openpkg-src/imap/imap.patch.annotate $ cvs diff -u -r0 -r1.1 imap.patch.annotate --- /dev/null 2007-05-31 15:22:25 +0200 +++ imap.patch.annotate 2007-05-31 15:22:59 +0200 @@ -0,0 +1,453 @@ +IMAP METADATA Extension +http://www.ietf.org/internet-drafts/draft-daboo-imap-annotatemore-11.txt + +## Copyright (c) 2004 Tassilo Erlewein <[EMAIL PROTECTED]> +## Copyright (c) 2004 Martin Konold <[EMAIL PROTECTED]> +## Copyright (c) 2005 Steffen Hansen <[EMAIL PROTECTED]> +http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/sources/imap-2004g-2.5.0_kolab.src.rpm + +Index: src/c-client/imap4r1.c +--- src/c-client/imap4r1.c.orig 2007-04-05 02:55:47 +0200 src/c-client/imap4r1.c 2007-05-30 10:14:11 +0200 +@@ -135,7 +135,8 @@ + #define MULTIAPPEND 13 + #define SNLIST 14 + #define MULTIAPPENDREDO 15 +- ++#define QLIST 16 ++#define QSTRING 17 + + /* Append data */ + +@@ -205,12 +206,15 @@ + void imap_gc_body (BODY *body); + void imap_capability (MAILSTREAM *stream); + long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]); ++long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]); + + IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]); + IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s); + long imap_soutr (MAILSTREAM *stream,char *string); + IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s, + SIZEDTEXT *as,long wildok,char *limit); ++IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s, ++
[CVS] OpenPKG: openpkg-src/apache2-php/ php.conf
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-May-2007 17:02:50 Branch: HEAD Handle: 2007053016025000 Modified files: openpkg-src/apache2-php php.conf Log: LoadModule takes two arguments Summary: RevisionChanges Path 1.2 +1 -1 openpkg-src/apache2-php/php.conf patch -p0 <<'@@ .' Index: openpkg-src/apache2-php/php.conf $ cvs diff -u -r1.1 -r1.2 php.conf --- openpkg-src/apache2-php/php.conf 30 May 2007 10:15:07 - 1.1 +++ openpkg-src/apache2-php/php.conf 30 May 2007 15:02:50 - 1.2 @@ -2,6 +2,6 @@ ## php.conf -- Apache configuration for PHP ## -LoadModule @l_prefix@/libexec/apache2/libphp5.so +LoadModule php5_module @l_prefix@/libexec/apache2/libphp5.so AddType application/x-httpd-php .php @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-May-2007 17:00:24 Branch: HEAD Handle: 2007053016002300 Modified files: openpkg-src/apache2 apache2.spec Log: envvars needs to executed by /sbin/apxs Summary: RevisionChanges Path 1.88+3 -0 openpkg-src/apache2/apache2.spec patch -p0 <<'@@ .' Index: openpkg-src/apache2/apache2.spec $ cvs diff -u -r1.87 -r1.88 apache2.spec --- openpkg-src/apache2/apache2.spec 30 May 2007 09:09:40 - 1.87 +++ openpkg-src/apache2/apache2.spec 30 May 2007 15:00:23 - 1.88 @@ -251,6 +251,9 @@ rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/{extra,original} ) || exit $? +# adjust permissions +chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars + # adjust GNU libtool configuration %{l_shtool} subst \ -e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-May-2007 10:42:31 Branch: HEAD Handle: 2007053009423100 Modified files: openpkg-src/openldapopenldap.spec Log: more ensurance our Berkeley-DB is picked up first Summary: RevisionChanges Path 1.188 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.187 -r1.188 openldap.spec --- openpkg-src/openldap/openldap.spec10 Apr 2007 07:01:47 - 1.187 +++ openpkg-src/openldap/openldap.spec30 May 2007 08:42:31 - 1.188 @@ -33,7 +33,7 @@ Group:LDAP License: GPL Version: 2.3.35 -Release: 20070410 +Release: 20070530 # package options %option with_fsl yes @@ -177,7 +177,7 @@ # configuration: use hard-links and make sure our Berkeley-DB is picked up first %{l_shtool} subst \ -e 's;ln -s;ln;g' \ --e 's;-ldb4[234];-ldb;g' \ +-e 's;-ldb4[234];%{l_prefix}/lib/libdb.a;g' \ -e 's;;"db.h";g' \ configure @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/binutils/ binutils.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-May-2007 10:32:15 Branch: HEAD Handle: 2007052909321500 Modified files: openpkg-src/binutilsbinutils.spec Log: GNU binutils strip(1) is broken on AIX Summary: RevisionChanges Path 1.76+9 -1 openpkg-src/binutils/binutils.spec patch -p0 <<'@@ .' Index: openpkg-src/binutils/binutils.spec $ cvs diff -u -r1.75 -r1.76 binutils.spec --- openpkg-src/binutils/binutils.spec19 Apr 2007 10:53:40 - 1.75 +++ openpkg-src/binutils/binutils.spec29 May 2007 08:32:15 - 1.76 @@ -33,7 +33,7 @@ Group:Compiler License: GPL Version: 2.17 -Release: 20070419 +Release: 20070529 # list of sources Source0: ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2 @@ -115,6 +115,14 @@ includedir=$RPM_BUILD_ROOT%{l_prefix}/include/binutils \ libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/binutils +# GNU binutils strip(1) is broken on AIX, +# use of OS supplied /usr/bin/strip from bos.rte.bind_cmds is mandatory +case "%{l_platform -t}" in +*-aix* ) rm $RPM_BUILD_ROOT%{l_prefix}/bin/strip \ +$RPM_BUILD_ROOT%{l_prefix}/man/man1/strip.1 + ;; +esac + # strip down installation rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir rm -f $RPM_BUILD_ROOT%{l_prefix}/info/standards.info @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-May-2007 17:00:11 Branch: HEAD Handle: 2007051116001000 Modified files: openpkg-src/js js.spec Log: modifying package: js-1.6.20070208 20070510 -> 20070511 Summary: RevisionChanges Path 1.46+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.45 -r1.46 js.spec --- openpkg-src/js/js.spec10 May 2007 05:54:56 - 1.45 +++ openpkg-src/js/js.spec11 May 2007 15:00:10 - 1.46 @@ -29,7 +29,7 @@ %define V_javascript_squish 0.05 %define V_javascript_code 0.08 %define V_javascript_jslint 0.06 -%define V_javascript_engine 0.010 +%define V_javascript_engine 0.011 %define V_jsmin 20070108 # package information @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070510 +Release: 20070511 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-May-2007 15:11:31 Branch: HEAD Handle: 2007051114113000 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrading package: openpkg 20070507 -> 20070511 Summary: RevisionChanges Path 1.449 +1 -0 openpkg-src/openpkg/HISTORY 1.584 +2 -2 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.448 -r1.449 HISTORY --- openpkg-src/openpkg/HISTORY 6 May 2007 22:17:02 - 1.448 +++ openpkg-src/openpkg/HISTORY 11 May 2007 13:11:30 - 1.449 @@ -2,6 +2,7 @@ 2007 +20070511 upgrade to "openpkg" executable version 2.0.1-C, do not rise privileges for "openpkg rpm" when given -[bt]* options 20070507 workaround PIC/DSO related problems under FreeBSD on sparc64 by enforcing -fPIC 20070419 meticulously obey order when creating user, group, login shell relationships 20070418 use bootstrapped bash to prevent problems when /bin/sh is not a bourne shell @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.583 -r1.584 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 6 May 2007 22:17:02 - 1.583 +++ openpkg-src/openpkg/openpkg.spec 11 May 2007 13:11:30 - 1.584 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070507 +%define V_openpkg 20070511 # the used software versions %define V_rpm 4.2.1 @@ -59,7 +59,7 @@ %define V_perl 5.8.8 %define V_openssl 0.9.8e %define V_tools1.4.4 -%define V_exec 2.0.0-C +%define V_exec 2.0.1-C # package information Name: openpkg @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-re/ releasenotes.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 02-May-2007 20:26:19 Branch: HEAD Handle: 2007050219261800 Modified files: openpkg-re releasenotes.txt Log: mention E1.0 in genealogy Summary: RevisionChanges Path 1.30+3 -1 openpkg-re/releasenotes.txt patch -p0 <<'@@ .' Index: openpkg-re/releasenotes.txt $ cvs diff -u -r1.29 -r1.30 releasenotes.txt --- openpkg-re/releasenotes.txt 21 Feb 2007 10:54:40 - 1.29 +++ openpkg-re/releasenotes.txt 2 May 2007 18:26:18 - 1.30 @@ -2,7 +2,7 @@ OpenPKG Release Notes = - o $Revision: 1.29 $. The most recent update of this file can be + o $Revision: 1.30 $. The most recent update of this file can be downloaded from http://cvs.openpkg.org/openpkg-re/releasenotes.txt The history of this document, specific versions and differences between versions can be retrieved from @@ -26,6 +26,8 @@ 2 (STABLE) CURRENT +E1.0 is very close to 2.20061018 + o Avoid skipping a release when upgrading, especially the bootstrap. o Limit release mixing within a single instance to the bare minimum. @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python/ python.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 21:02:44 Branch: HEAD Handle: 2007041920024300 Modified files: openpkg-src/python python.spec Log: disable IPv6 support on AIX to workaround a getaddrinfo bug; enforce gcc to prevent vendor compiler flag usage; sponsored by BinckBank Summary: RevisionChanges Path 1.77+10 -1 openpkg-src/python/python.spec patch -p0 <<'@@ .' Index: openpkg-src/python/python.spec $ cvs diff -u -r1.76 -r1.77 python.spec --- openpkg-src/python/python.spec19 Apr 2007 15:25:53 - 1.76 +++ openpkg-src/python/python.spec19 Apr 2007 19:02:43 - 1.77 @@ -173,13 +173,22 @@ echo "_ssl _ssl.c -DUSE_SSL %{l_cppflags openssl .} %{l_ldflags} -lssl -lcrypto" ) >>Modules/Setup.local %endif -CC="%{l_cc}" \ + +# getaddrinfo bug +disableipv6="" +case "%{l_platform -t}" in +*-aix* ) disableipv6="--disable-ipv6" ;; +esac + +CC="%{l_prefix}/bin/gcc" \ CXX="%{l_cxx}" \ CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ LDFLAGS="%{l_ldflags}" \ ./configure \ --cache-file=./config.cache \ +--with-gcc \ +$disableipv6 \ --prefix=%{l_prefix} %{l_make} %{l_mflags} @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl/ perl.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 17:03:44 Branch: HEAD Handle: 2007041916034100 Modified files: openpkg-src/perlperl.spec Log: Configure wants to see -Uarg instead of -Darg= (empty); Configure assumes vendor compiler on AIX if name is "cc" and passes options incompatible to gcc, so force it to use gcc under appropiate name; sponsored by BinckBank Summary: RevisionChanges Path 1.113 +8 -2 openpkg-src/perl/perl.spec patch -p0 <<'@@ .' Index: openpkg-src/perl/perl.spec $ cvs diff -u -r1.112 -r1.113 perl.spec --- openpkg-src/perl/perl.spec1 Jan 2007 17:40:40 - 1.112 +++ openpkg-src/perl/perl.spec19 Apr 2007 15:03:41 - 1.113 @@ -33,7 +33,7 @@ Group:Perl License: GPL/Artistic Version: 5.8.8 -Release: 20061013 +Release: 20070419 # list of sources Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz @@ -74,11 +74,17 @@ %{l_shtool} subst \ -e 's; */usr/local/lib;;' \ hints/freebsd.sh hints/netbsd.sh +optimize="" case "%{l_platform -t}" in amd64-* ) optimize="%{l_cflags}";; *-aix* ) optimize="%{l_cflags}";; *-* ) optimize="%{l_cflags -O}" ;; esac +if [ ".$optimize" = . ]; then +optimize="-Uoptimize" +else +optimize="-Doptimize=$optimize" +fi libdirs="" for dir in %{l_prefix}/lib /lib64 /usr/lib64 /lib /usr/lib /usr/ccs/lib; do [ -d $dir ] && libdirs="$libdirs $dir" @@ -93,7 +99,7 @@ -Dinstallstyle="lib/perl5" \ -Dman1dir=%{l_prefix}/man/man1 \ -Dman3dir=%{l_prefix}/man/man3 \ --Dcc="%{l_cc}" -Doptimize="$optimize" \ +-Dcc="%{l_prefix}/bin/gcc" "$optimize" \ -Dlocincpth="%{l_prefix}/include" \ -Dloclibpth="%{l_prefix}/lib" \ -Dldflags="%{l_ldflags}" \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 13:24:05 Branch: HEAD Handle: 2007041912240500 Modified files: openpkg-src/gcc gcc.spec Log: replace as/ld availability assumption with feature testing; together with [34937] this eliminates the need for the with_binutils option entirely and also removes a linux/freebsd platform assumption; sponsored by BinckBank Summary: RevisionChanges Path 1.136 +12 -18 openpkg-src/gcc/gcc.spec patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.135 -r1.136 gcc.spec --- openpkg-src/gcc/gcc.spec 19 Apr 2007 11:22:46 - 1.135 +++ openpkg-src/gcc/gcc.spec 19 Apr 2007 11:24:05 - 1.136 @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20070214 +Release: 20070419 # package options %option with_cxx yes @@ -46,7 +46,6 @@ %option with_fortran no %option with_optimize yes %option with_profile no -%option with_binutils yes %option with_threads yes %option with_multilib no @@ -59,10 +58,8 @@ BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060622, make PreReq: OpenPKG, openpkg >= 20060622 -%if "%{with_binutils}" == "yes" BuildPreReq: binutils >= 2.14 PreReq: binutils >= 2.14 -%endif %if "%{with_fortran}" == "yes" BuildPreReq: mpfr PreReq: mpfr @@ -118,16 +115,12 @@ # determine ld(1) and as(1) usage l_with_gnu_ld_as="" -%if "%{with_binutils}" == "yes" -l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld --with-ld=%{l_prefix}/bin/ld" -l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as --with-as=%{l_prefix}/bin/as" -%else -case "%{l_platform -t}" in - *-linux* | *-freebsd* ) - l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as --with-gnu-ld" - ;; -esac -%endif +LD="%{l_tool_locate ld ld}" +AS="%{l_tool_locate as as}" +echo "$LD" | grep "^/" >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-ld=\"$LD\"" +echo "$AS" | grep "^/" >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-as=\"$AS\"" +"$LD" --version 2>/dev/null | grep "^GNU ld ">/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld" +"$AS" --version 2>/dev/null | grep "^GNU assembler " >/dev/null && l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as" # determine threads usage %if "%{with_threads}" == "yes" @@ -205,11 +198,12 @@ case "%{l_platform -t}" in alpha*-tru64* ) if [ ".$l_ccisgcc" = .no ]; then l_libcflags="$l_libcflags -ieee"; fi ;; esac -%if "%{with_binutils}" == "yes" # at least GNU as from GNU binutils supports -pipe always -l_boot_cflags="$l_boot_cflags -pipe" -l_libcxxflags="$l_libcxxflags -pipe" -%endif +AS="%{l_tool_locate as as}" +"$AS" --version 2>/dev/null | grep "^GNU assembler " >/dev/null && { +l_boot_cflags="$l_boot_cflags -pipe"; +l_libcxxflags="$l_libcxxflags -pipe"; +} %if "%{with_optimize}" == "yes" # conservatively optimize the generated program code # (also _tune_ for particular CPUs, but _without_ requiring these CPUs!) @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 13:22:46 Branch: HEAD Handle: 2007041912224600 Modified files: openpkg-src/gcc gcc.spec Log: allow repetitive execution of %build Summary: RevisionChanges Path 1.135 +1 -1 openpkg-src/gcc/gcc.spec patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.134 -r1.135 gcc.spec --- openpkg-src/gcc/gcc.spec 14 Feb 2007 17:41:09 - 1.134 +++ openpkg-src/gcc/gcc.spec 19 Apr 2007 11:22:46 - 1.135 @@ -113,7 +113,7 @@ %build # create build sub-directory -mkdir obj +%{l_shtool} mkdir -p obj cd obj # determine ld(1) and as(1) usage @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/binutils/ binutils.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 12:53:40 Branch: HEAD Handle: 2007041911534000 Modified files: openpkg-src/binutilsbinutils.spec Log: do not build as and ld on AIX; at least ld is well known not work; sponsored by BinckBank Summary: RevisionChanges Path 1.75+2 -1 openpkg-src/binutils/binutils.spec patch -p0 <<'@@ .' Index: openpkg-src/binutils/binutils.spec $ cvs diff -u -r1.74 -r1.75 binutils.spec --- openpkg-src/binutils/binutils.spec1 Jan 2007 17:36:48 - 1.74 +++ openpkg-src/binutils/binutils.spec19 Apr 2007 10:53:40 - 1.75 @@ -33,7 +33,7 @@ Group:Compiler License: GPL Version: 2.17 -Release: 20061117 +Release: 20070419 # list of sources Source0: ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2 @@ -80,6 +80,7 @@ *-freebsd* ) CFLAGS="$CFLAGS -DOPENPKG_OS_FREEBSD" ;; *-linux* ) CFLAGS="$CFLAGS -DOPENPKG_OS_LINUX" ;; *-sunos* ) CFLAGS="$CFLAGS -DOPENPKG_OS_SOLARIS" ;; +*-aix* ) ARGS="$ARGS --without-gnu-as --without-gnu-ld" ;; esac case "%{l_platform -t}" in amd64-sunos* ) ARGS="$ARGS --enable-64-bit-bdf" ;; @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 12:47:31 Branch: HEAD Handle: 2007041911472901 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: meticulously obey order when creating user, group, login shell relationships; AIX does not allow us to cheat and assign a nonexisting group or nonexisting, insecure or nonexecutable shell. The shell setting can be deferred to %post but group correction must occur before "openpkg" setuid wrapper goes to action; sponsored by BinckBank Summary: RevisionChanges Path 1.447 +1 -0 openpkg-src/openpkg/HISTORY 1.582 +12 -3 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.446 -r1.447 HISTORY --- openpkg-src/openpkg/HISTORY 19 Apr 2007 10:44:18 - 1.446 +++ openpkg-src/openpkg/HISTORY 19 Apr 2007 10:47:29 - 1.447 @@ -2,6 +2,7 @@ 2007 +20070419 meticulously obey order when creating user, group, login shell relationships 20070418 use bootstrapped bash to prevent problems when /bin/sh is not a bourne shell 20070417 support %l_as macro and --use_as bootstrap option to complement ar, ld, strip handling 20070411 upgrade to cURL 7.16.2 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.581 -r1.582 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:44:19 - 1.581 +++ openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:47:30 - 1.582 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070418 +%define V_openpkg 20070419 # the used software versions %define V_rpm 4.2.1 @@ -1721,6 +1721,9 @@ fi fi +# clear pending deferred actions +rm -f %{l_prefix}.pre-group-process.sh %{l_prefix}.pre-post-process.sh >/dev/null 2>&1 + # create the hierarchy user/group for req in "superuser:${susr}:${suid}:${sgrp}:${sgid}" \ "management:${musr}:${muid}:${mgrp}:${mgid}" \ @@ -1805,8 +1808,8 @@ rm -f /etc/security/login.cfg.bak >/dev/null 2>&1 # defer both the setting of the primary group and the shell, # as they do not exist at this stage of processing. -( echo "chuser pgrp=\"${grp}\" shell=\"${shell}\" \"${usr}\"" -) >%{l_prefix}.pre-post-process.sh +echo "chuser pgrp=\"${grp}\" \"${usr}\"" >>%{l_prefix}.pre-group-process.sh +echo "chuser shell=\"${shell}\" \"${usr}\"" >>%{l_prefix}.pre-post-process.sh ;; * ) cp $file $file.bak && \ @@ -1853,6 +1856,12 @@ fi done +# optional group processing (deferred adjustment of primary group) +if [ -f %{l_prefix}.pre-group-process.sh ]; then +sh %{l_prefix}.pre-group-process.sh +rm -f %{l_prefix}.pre-group-process.sh +fi + # invalidate passwd and group tables from Name Service Cache Daemon to # ensure chown/chgrp works immediately after pwconv on Linux and Solaris if [ -x /usr/sbin/nscd ]; then @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.boot openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 12:44:20 Branch: HEAD Handle: 2007041911441801 Modified files: openpkg-src/openpkg HISTORY openpkg.boot openpkg.spec Log: use bootstrapped bash to prevent problems when /bin/sh is not a bourne shell; Fixes a problem on AIX where ksh is used an LOGNAME being set readonly; sponsored by BinckBank Summary: RevisionChanges Path 1.446 +1 -0 openpkg-src/openpkg/HISTORY 1.65+1 -3 openpkg-src/openpkg/openpkg.boot 1.581 +1 -1 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.445 -r1.446 HISTORY --- openpkg-src/openpkg/HISTORY 19 Apr 2007 10:41:51 - 1.445 +++ openpkg-src/openpkg/HISTORY 19 Apr 2007 10:44:18 - 1.446 @@ -2,6 +2,7 @@ 2007 +20070418 use bootstrapped bash to prevent problems when /bin/sh is not a bourne shell 20070417 support %l_as macro and --use_as bootstrap option to complement ar, ld, strip handling 20070411 upgrade to cURL 7.16.2 20070329 add variables to expand uuid(8) information in the "openpkg release" format @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.boot $ cvs diff -u -r1.64 -r1.65 openpkg.boot --- openpkg-src/openpkg/openpkg.boot 19 Apr 2007 10:41:51 - 1.64 +++ openpkg-src/openpkg/openpkg.boot 19 Apr 2007 10:44:19 - 1.65 @@ -401,7 +401,7 @@ -e "s;^\\(%_sourcedir *\\).*;\\1 $distdir;" \ -e "s;^\\(%_builddir *\\).*;\\1 $tmpdir;" \ -e "s;^\\(%_tmppath *\\).*;\\1 $tmpdir;" \ --e "s;^\\(%_buildshell *\\).*;\\1 /bin/sh;" \ +-e "s;^\\(%_buildshell *\\).*;\\1 env -i OPENPKG_BOOT=1 %{l_build_shell_cmd} %{l_build_shell_opt};" \ -e "s;@l_build_path@;/bin:/sbin:/usr/bin:/usr/sbin;g" \ -e "s;@l_build_ldlp@;/usr/lib;g" \ -e "s;@l_build_ulim@;:;g" @@ -435,8 +435,6 @@ ## echo "++ re-iterating over RPM specification procedures" -OPENPKG_BOOT=1 -export OPENPKG_BOOT $tmpdir/rpm -bb $spec ## @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.580 -r1.581 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:41:51 - 1.580 +++ openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:44:19 - 1.581 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070417 +%define V_openpkg 20070418 # the used software versions %define V_rpm 4.2.1 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY aux.wrapsrc.sh openpkg.boo...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2007 12:41:53 Branch: HEAD Handle: 2007041911415101 Modified files: openpkg-src/openpkg HISTORY aux.wrapsrc.sh openpkg.boot openpkg.spec rpmmacros Log: support %l_as macro and --use_as bootstrap option to complement ar, ld, strip handling sponsored by BinckBank Summary: RevisionChanges Path 1.445 +1 -0 openpkg-src/openpkg/HISTORY 1.24+1 -1 openpkg-src/openpkg/aux.wrapsrc.sh 1.64+4 -2 openpkg-src/openpkg/openpkg.boot 1.580 +14 -1 openpkg-src/openpkg/openpkg.spec 1.82+1 -0 openpkg-src/openpkg/rpmmacros patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.444 -r1.445 HISTORY --- openpkg-src/openpkg/HISTORY 11 Apr 2007 15:48:48 - 1.444 +++ openpkg-src/openpkg/HISTORY 19 Apr 2007 10:41:51 - 1.445 @@ -2,6 +2,7 @@ 2007 +20070417 support %l_as macro and --use_as bootstrap option to complement ar, ld, strip handling 20070411 upgrade to cURL 7.16.2 20070329 add variables to expand uuid(8) information in the "openpkg release" format 20070322 cosmetic: align code variable name with documentation @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/aux.wrapsrc.sh $ cvs diff -u -r1.23 -r1.24 aux.wrapsrc.sh --- openpkg-src/openpkg/aux.wrapsrc.sh1 Jan 2007 17:40:18 - 1.23 +++ openpkg-src/openpkg/aux.wrapsrc.sh19 Apr 2007 10:41:51 - 1.24 @@ -60,7 +60,7 @@ echo " [--{s,m,r,n}usr=] [--{s,m,r,n}grp=]" 2>&1 echo " [--{s,m,r,n}uid=] [--{s,m,r,n}gid=]" 2>&1 echo " [--use_tar=] [--use_make=] [--use_cc=]" 2>&1 -echo " [--use_ar=] [--use_ld=] [--use_strip=]" 2>&1 +echo " [--use_ar=] [--use_ld=] [--use_as=] [--use_strip=]" 2>&1 echo " [-t|--tar] [-h|--help] [-v|--version]" 2>&1 exit 1 fi @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.boot $ cvs diff -u -r1.63 -r1.64 openpkg.boot --- openpkg-src/openpkg/openpkg.boot 21 Feb 2007 10:42:44 - 1.63 +++ openpkg-src/openpkg/openpkg.boot 19 Apr 2007 10:41:51 - 1.64 @@ -56,7 +56,7 @@ muid=''; mgid='' ruid=''; rgid='' nuid=''; ngid='' -use_tar=''; use_make=''; use_cc=''; use_ar=''; use_ld=''; use_strip='' +use_tar=''; use_make=''; use_cc=''; use_ar=''; use_ld=''; use_as=''; use_strip='' bs=0 # parse command line options @@ -94,6 +94,7 @@ --use_cc=* ) use_cc=$arg;; --use_ar=* ) use_ar=$arg;; --use_ld=* ) use_ld=$arg;; +--use_as=* ) use_as=$arg;; --use_strip=*) use_strip=$arg ;; -bs | -s ) bs=1;; *) help=1 ;; @@ -109,7 +110,7 @@ echo " [--{s,m,r,n}usr=] [--{s,m,r,n}grp=]" 2>&1 echo " [--{s,m,r,n}uid=] [--{s,m,r,n}gid=]" 2>&1 echo " [--use_tar=] [--use_make=] [--use_cc=]" 2>&1 -echo " [--use_ar=] [--use_ld=] [--use_strip=]" 2>&1 +echo " [--use_ar=] [--use_ld=] [--use_as=] [--use_strip=]" 2>&1 echo " [-t|--tar] [-h|--help] [-v|--version]" 2>&1 exit 1 fi @@ -285,6 +286,7 @@ echo "use_cc=$use_cc" echo "use_ar=$use_ar" echo "use_ld=$use_ld" + echo "use_as=$use_as" echo "use_strip=$use_strip" grep '%define' $spec | \ sed \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.579 -r1.580 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 11 Apr 2007 15:48:48 -0
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec release.8 rel...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Mar-2007 09:35:05 Branch: HEAD Handle: 2007032908350102 Modified files: openpkg-src/openpkg HISTORY openpkg.spec release.8 release.pod release.sh Log: add variables to expand uuid(8) information in the "openpkg release" format Summary: RevisionChanges Path 1.443 +1 -0 openpkg-src/openpkg/HISTORY 1.578 +1 -1 openpkg-src/openpkg/openpkg.spec 1.3 +7 -2 openpkg-src/openpkg/release.8 1.3 +8 -2 openpkg-src/openpkg/release.pod 1.6 +6 -0 openpkg-src/openpkg/release.sh patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.442 -r1.443 HISTORY --- openpkg-src/openpkg/HISTORY 22 Mar 2007 21:52:58 - 1.442 +++ openpkg-src/openpkg/HISTORY 29 Mar 2007 07:35:01 - 1.443 @@ -2,6 +2,7 @@ 2007 +20070329 add variables to expand uuid(8) information in the "openpkg release" format 20070322 cosmetic: align code variable name with documentation 20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when creating OPENPKG_DESC default 20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.577 -r1.578 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 22 Mar 2007 21:52:58 - 1.577 +++ openpkg-src/openpkg/openpkg.spec 29 Mar 2007 07:35:01 - 1.578 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070322 +%define V_openpkg 20070329 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/release.8 $ cvs diff -u -r1.2 -r1.3 release.8 --- openpkg-src/openpkg/release.8 25 Aug 2006 08:58:49 - 1.2 +++ openpkg-src/openpkg/release.8 29 Mar 2007 07:35:02 - 1.3 @@ -148,8 +148,10 @@ The output format specification. The argument \fIformat\fR is an arbitrary string which can contain the special expansion constructs "\f(CW%t\fR\*(L" for expanding the release tag, \*(R"\f(CW%u\fR\*(L" for expanding the distribution \s-1URL\s0 -and \*(R"\f(CW\*(C`\en\*(C'\fR" for expanding an embedded newline character. The default -\&\fIformat\fR is "\f(CW\*(C`OpenPKG\-%t %u\*(C'\fR". +and \*(R"\f(CW\*(C`\en\*(C'\fR" for expanding an embedded newline character. +The instance \s-1UUID\s0 information is also availble by expanding +\&\f(CW%r\fR to \s-1UUID_REGISTRY\s0, \f(CW%i\fR to \s-1UUID_INSTANCE\s0, \f(CW%p\fR to \s-1UUID_PLATFORM\s0. +The default \fIformat\fR is "\f(CW\*(C`OpenPKG\-%t %u\*(C'\fR". .IP "\fB\-r\fR, \fB\-\-release\fR \fIrelease\fR" 4 .IX Item "-r, --release release" The package "\f(CW\*(C`Release\*(C'\fR" header value to use for deriving the release @@ -214,6 +216,9 @@ \& TAG=2-STABLE-20060622 \& URL=ftp://ftp.example.com/mirror/openpkg.org/* .Ve +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIuuid\fR\|(8) .SH "HISTORY" .IX Header "HISTORY" The \fBopenpkg release\fR command first appeared in \fBOpenPKG 2\-STABLE\-20060622\fR. @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/release.pod $ cvs diff -u -r1.2 -r1.3 release.pod --- openpkg-src/openpkg/release.pod 1 Jan 2007 17:40:19 - 1.2 +++ openpkg-src/openpkg/release.pod 29 Mar 2007 07:35:03 - 1.3 @@ -48,8 +48,10 @@ The output format specification. The argument I is an arbitrary string which can contain the special expansion constructs "C<%t>" for expanding the release tag, "C<%u>" for expanding the distribution URL -and "C<\n>" for expanding an embedded newline character. The default -I is "C". +and "C<\n>" for expanding an embedded newline cha
[CVS] OpenPKG: OPENPKG_2_5_SOLID: openpkg-src/fsl/ fsl.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Mar-2007 12:47:27 Branch: OPENPKG_2_5_SOLIDHandle: 2007032811472600 Modified files: (Branch: OPENPKG_2_5_SOLID) openpkg-src/fsl fsl.spec Log: MFC: large file support for l2_ch_file, motivated by the Kolab-Konsortium Summary: RevisionChanges Path 1.82.2.2+4 -2 openpkg-src/fsl/fsl.spec patch -p0 <<'@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.82.2.1 -r1.82.2.2 fsl.spec --- openpkg-src/fsl/fsl.spec 11 Oct 2005 12:49:56 - 1.82.2.1 +++ openpkg-src/fsl/fsl.spec 28 Mar 2007 10:47:26 - 1.82.2.2 @@ -32,8 +32,8 @@ Class:CORE Group:System License: MIT-style -Version: 1.6.1 -Release: 2.5.0 +Version: 1.7.0 +Release: 2.5.1 # package options %option with_fsl_debuglogcode no @@ -77,8 +77,10 @@ %build CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ +GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ +--mandir=%{l_prefix}/man \ %if "%{with_fsl_debuglogcode}" == "yes" --with-fsl-debuglogcode=yes \ --with-fsl-debuglogfile=%{l_prefix}/var/fsl/debuglogfile \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY openpkg....
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Mar-2007 00:02:34 Branch: OPENPKG_2_STABLE Handle: 2007032223023102 Modified files: (Branch: OPENPKG_2_STABLE) openpkg-src/openpkg HISTORY openpkg.spec rc rc.func rc.openpkg uuid.sh Log: MFC: latest registry fine tuning, rc fixes and compatibility removal Summary: RevisionChanges Path 1.337.2.22 +10 -0 openpkg-src/openpkg/HISTORY 1.490.2.22 +15 -15 openpkg-src/openpkg/openpkg.spec 1.62.2.3+1 -7 openpkg-src/openpkg/rc 1.15.2.2+1 -37 openpkg-src/openpkg/rc.func 1.19.12.3 +12 -6 openpkg-src/openpkg/rc.openpkg 1.8.2.3 +11 -33 openpkg-src/openpkg/uuid.sh patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.337.2.21 -r1.337.2.22 HISTORY --- openpkg-src/openpkg/HISTORY 18 Mar 2007 23:31:59 - 1.337.2.21 +++ openpkg-src/openpkg/HISTORY 22 Mar 2007 23:02:31 - 1.337.2.22 @@ -2,6 +2,16 @@ 2007 +20070322 RELEASE AS PART OF OPENPKG 2.20070322 +20070322 cosmetic: align code variable name with documentation +20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when creating OPENPKG_DESC default +20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs +20070320 improve generation of UUID_PLATFORM by using a better (no longer IP based) "discriminator" value +20070320 remove old support for never finished rcng +20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's opXXX functions +20070319 change "rc" to not check permissions for --print operations +20070319 fix eval "rc" in rc.func which relies on PATH and conflicts with Plan 9 shell + 20070319 RELEASE AS PART OF OPENPKG 2.20070319 20070305 invalidate passwd and group tables from Name Service Cache Daemon after pwconv 20070305 upgrade to rpmtool 1.1.0 remove dormant code for system user/group addition/removal @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.490.2.21 -r1.490.2.22 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 18 Mar 2007 23:32:00 - 1.490.2.21 +++ openpkg-src/openpkg/openpkg.spec 22 Mar 2007 23:02:31 - 1.490.2.22 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 2.20070319 +%define V_openpkg 2.20070322 # the used software versions %define V_rpm 4.2.1 @@ -55,7 +55,7 @@ %define V_bash 3.2 %define V_uuid 1.5.1 %define V_config 20060923 -%define V_registry 1.1.1 +%define V_registry 1.1.2 %define V_perl 5.8.8 %define V_openssl 0.9.8e %define V_tools1.4.4 @@ -1628,12 +1628,12 @@ [ ".$prefix" = . ] && prefix="%{l_prefix}" prefix=`echo "$prefix" | sed -e 's;//*;/;g' -e 's;/$;;'` -# register the OpenPKG instance in /etc/openpkg -registry="/etc/openpkg" -exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"` +# register instance in presence file +presence="/etc/openpkg" +exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"` if [ ".$exists" = . ]; then ( umask 022 - echo "${prefix}" >>$registry + echo "${prefix}" >>$presence ) 2>/dev/null || true fi @@ -2488,19 +2488,19 @@ r=`(uname -r) 2>/dev/null` || r='0.0' plid="${s}/${r}" -# unregister the OpenPKG instance in /etc/openpkg -registry="/etc/openpkg" -exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"` +# unregister instance in presence file +presence="/etc/openpkg" +exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"` if [ ".$exists" != . ]; then if [ ".$cusr" != ".root" ]; then -echo "openpkg:WARNING: skipping unregistering of $prefix in $registry" 1>&2 +echo "openpkg:WARNING: s
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Mar-2007 22:52:59 Branch: HEAD Handle: 2007032221525800 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: cosmetic: align code variable name with documentation Summary: RevisionChanges Path 1.442 +1 -0 openpkg-src/openpkg/HISTORY 1.577 +14 -14 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.441 -r1.442 HISTORY --- openpkg-src/openpkg/HISTORY 21 Mar 2007 10:09:16 - 1.441 +++ openpkg-src/openpkg/HISTORY 22 Mar 2007 21:52:58 - 1.442 @@ -2,6 +2,7 @@ 2007 +20070322 cosmetic: align code variable name with documentation 20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when creating OPENPKG_DESC default 20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs 20070320 improve generation of UUID_PLATFORM by using a better (no longer IP based) "discriminator" value @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.576 -r1.577 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 21 Mar 2007 10:09:17 - 1.576 +++ openpkg-src/openpkg/openpkg.spec 22 Mar 2007 21:52:58 - 1.577 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070321 +%define V_openpkg 20070322 # the used software versions %define V_rpm 4.2.1 @@ -1627,12 +1627,12 @@ [ ".$prefix" = . ] && prefix="%{l_prefix}" prefix=`echo "$prefix" | sed -e 's;//*;/;g' -e 's;/$;;'` -# register the OpenPKG instance in /etc/openpkg -registry="/etc/openpkg" -exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"` +# register instance in presence file +presence="/etc/openpkg" +exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"` if [ ".$exists" = . ]; then ( umask 022 - echo "${prefix}" >>$registry + echo "${prefix}" >>$presence ) 2>/dev/null || true fi @@ -2487,19 +2487,19 @@ r=`(uname -r) 2>/dev/null` || r='0.0' plid="${s}/${r}" -# unregister the OpenPKG instance in /etc/openpkg -registry="/etc/openpkg" -exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"` +# unregister instance in presence file +presence="/etc/openpkg" +exists=`cat $presence 2>/dev/null | egrep "^ *${prefix} *\$"` if [ ".$exists" != . ]; then if [ ".$cusr" != ".root" ]; then -echo "openpkg:WARNING: skipping unregistering of $prefix in $registry" 1>&2 +echo "openpkg:WARNING: skipping unregistering of $prefix in $presence" 1>&2 echo "openpkg:WARNING: (would require root-privileges)" 1>&2 else -cp $registry $registry.bak && \ -egrep -v "^ *${prefix} *\$" $registry.bak >$registry -rm -f $registry.bak >/dev/null 2>&1 -if [ ".`cat $registry`" = . ]; then -rm -f $registry >/dev/null 2>&1 +cp $presence $presence.bak && \ +egrep -v "^ *${prefix} *\$" $presence.bak >$presence +rm -f $presence.bak >/dev/null 2>&1 +if [ ".`cat $presence`" = . ]; then +rm -f $presence >/dev/null 2>&1 fi fi fi @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Mar-2007 11:09:17 Branch: HEAD Handle: 2007032110091601 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrading package: openpkg 20070320 -> 20070321 Summary: RevisionChanges Path 1.441 +1 -0 openpkg-src/openpkg/HISTORY 1.576 +2 -2 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.440 -r1.441 HISTORY --- openpkg-src/openpkg/HISTORY 20 Mar 2007 22:12:43 - 1.440 +++ openpkg-src/openpkg/HISTORY 21 Mar 2007 10:09:16 - 1.441 @@ -2,6 +2,7 @@ 2007 +20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when creating OPENPKG_DESC default 20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs 20070320 improve generation of UUID_PLATFORM by using a better (no longer IP based) "discriminator" value 20070320 remove old support for never finished rcng @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.575 -r1.576 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 20 Mar 2007 11:29:50 - 1.575 +++ openpkg-src/openpkg/openpkg.spec 21 Mar 2007 10:09:17 - 1.576 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070320 +%define V_openpkg 20070321 # the used software versions %define V_rpm 4.2.1 @@ -55,7 +55,7 @@ %define V_bash 3.2 %define V_uuid 1.5.1 %define V_config 20060923 -%define V_registry 1.1.1 +%define V_registry 1.1.2 %define V_perl 5.8.8 %define V_openssl 0.9.8e %define V_tools1.4.4 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Mar-2007 11:07:00 Branch: HEAD Handle: 200703211007 Modified files: openpkg-src/openpkg-registry openpkg-registry.spec Log: upgrading package: openpkg-registry 1.1.1 -> 1.1.2 Summary: RevisionChanges Path 1.36+2 -2 openpkg-src/openpkg-registry/openpkg-registry.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg-registry/openpkg-registry.spec $ cvs diff -u -r1.35 -r1.36 openpkg-registry.spec --- openpkg-src/openpkg-registry/openpkg-registry.spec2 Mar 2007 22:12:26 - 1.35 +++ openpkg-src/openpkg-registry/openpkg-registry.spec21 Mar 2007 10:07:00 - 1.36 @@ -32,8 +32,8 @@ Class:PLUS Group:Bootstrapping License: BSD-style -Version: 1.1.1 -Release: 20070302 +Version: 1.1.2 +Release: 20070321 # package options %option with_client yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ VERSION registry-db.pl registry-ui.pl...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 21-Mar-2007 11:03:02 Branch: HEAD Handle: 2007032110030100 Modified files: openpkg-registryVERSION registry-db.pl registry-ui.pl registry.pm Log: bump before release Summary: RevisionChanges Path 1.33+1 -1 openpkg-registry/VERSION 1.58+2 -2 openpkg-registry/registry-db.pl 1.107 +2 -2 openpkg-registry/registry-ui.pl 1.15+2 -2 openpkg-registry/registry.pm patch -p0 <<'@@ .' Index: openpkg-registry/VERSION $ cvs diff -u -r1.32 -r1.33 VERSION --- openpkg-registry/VERSION 2 Mar 2007 10:06:16 - 1.32 +++ openpkg-registry/VERSION 21 Mar 2007 10:03:01 - 1.33 @@ -2,5 +2,5 @@ VERSION -- Version Information for OpenPKG Registry (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OpenPKG Registry, Version 1.1.1 (02-Mar-2007) + This is OpenPKG Registry, Version 1.1.2 (21-Mar-2007) @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-db.pl $ cvs diff -u -r1.57 -r1.58 registry-db.pl --- openpkg-registry/registry-db.pl 2 Mar 2007 10:06:17 - 1.57 +++ openpkg-registry/registry-db.pl 21 Mar 2007 10:03:01 - 1.58 @@ -34,8 +34,8 @@ # program name, version and date my $progname="registry-db.pl"; -my $progvers="1.1.1"; -my $progdate="02-Mar-2007"; +my $progvers="1.1.2"; +my $progdate="21-Mar-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-ui.pl $ cvs diff -u -r1.106 -r1.107 registry-ui.pl --- openpkg-registry/registry-ui.pl 2 Mar 2007 10:06:17 - 1.106 +++ openpkg-registry/registry-ui.pl 21 Mar 2007 10:03:01 - 1.107 @@ -41,8 +41,8 @@ # program name, version and date my $progname="registry-ui.pl"; -my $progvers="1.1.1"; -my $progdate="02-Mar-2007"; +my $progvers="1.1.2"; +my $progdate="21-Mar-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry.pm $ cvs diff -u -r1.14 -r1.15 registry.pm --- openpkg-registry/registry.pm 2 Mar 2007 10:06:17 - 1.14 +++ openpkg-registry/registry.pm 21 Mar 2007 10:03:01 - 1.15 @@ -30,8 +30,8 @@ # program name, version and date my $progname="registry.pm"; -my $progvers="1.1.1"; -my $progdate="02-Mar-2007"; +my $progvers="1.1.2"; +my $progdate="21-Mar-2007"; # get configuration file name # @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ register.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 21-Mar-2007 11:02:33 Branch: HEAD Handle: 2007032110023200 Modified files: openpkg-registryregister.sh Log: replace REGISTRY_DESC default of bash HOSTNAME with a local FQDN created by more portable shtool echo Summary: RevisionChanges Path 1.64+5 -4 openpkg-registry/register.sh patch -p0 <<'@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.63 -r1.64 register.sh --- openpkg-registry/register.sh 2 Mar 2007 10:06:17 - 1.63 +++ openpkg-registry/register.sh 21 Mar 2007 10:02:32 - 1.64 @@ -29,8 +29,8 @@ # program name, version and date progname="register" -progvers="1.1.1" -progdate="02-Mar-2007" +progvers="1.1.2" +progdate="21-Mar-2007" # determine path to OpenPKG instance PREFIX="@l_prefix@" @@ -113,6 +113,7 @@ ## # default parameters +FQDN=`$PREFIX/lib/openpkg/shtool echo -e '%h%d'` # primary operations op="automatic" @@ -123,7 +124,7 @@ REGISTRY_ARGS="http://registry.openpkg.org/register"; REGISTRY_USER="" REGISTRY_LINK="" -REGISTRY_DESC="openpkg://${HOSTNAME}${PREFIX}" +REGISTRY_DESC="openpkg://${FQDN}${PREFIX}" # advanced options # we are called from rpm URL rewrite wrapper, @@ -886,7 +887,7 @@ Indicates a human readable description of the instance. This information in submitted via the "registry_desc" attribute of the XML request. It appears in the "description" column on the "association" page of the web form and can be edited on the server side. -Defaults to "openpkg://${HOSTNAME}${PREFIX}" +Defaults to "openpkg://${FQDN}${PREFIX}" =back @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY rc.openpkg
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2007 23:12:43 Branch: HEAD Handle: 2007032022124300 Modified files: openpkg-src/openpkg HISTORY rc.openpkg Log: automatic (re-)registration if previous registration, community series or release set to openpkg URLs Summary: RevisionChanges Path 1.440 +1 -0 openpkg-src/openpkg/HISTORY 1.23+12 -6 openpkg-src/openpkg/rc.openpkg patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.439 -r1.440 HISTORY --- openpkg-src/openpkg/HISTORY 20 Mar 2007 12:50:58 - 1.439 +++ openpkg-src/openpkg/HISTORY 20 Mar 2007 22:12:43 - 1.440 @@ -2,6 +2,7 @@ 2007 +20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs 20070320 improve generation of UUID_PLATFORM by using a better (no longer IP based) "discriminator" value 20070320 remove old support for never finished rcng 20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's opXXX functions @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rc.openpkg $ cvs diff -u -r1.22 -r1.23 rc.openpkg --- openpkg-src/openpkg/rc.openpkg21 Feb 2007 10:42:44 - 1.22 +++ openpkg-src/openpkg/rc.openpkg20 Mar 2007 22:12:43 - 1.23 @@ -28,12 +28,18 @@ %hourly -u @l_musr@ rcService openpkg enable yes || exit 0 -reregister=0; @l_prefix@/bin/openpkg register --printstatus >/dev/null 2>&1 && reregister=1 -# check for "openpkg" executable from the OpenPKG Community series -# if OSS, register with openpkg.org -[EMAIL PROTECTED]@/bin/openpkg --license 2>/dev/null | \ -sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'` -if [ ".$community_version" != . -o $reregister -eq 1 ]; then +# automatic (re-)registration +reregister=0 +# re-register if previously registered +@l_prefix@/bin/openpkg register --printstatus >/dev/null 2>&1 && reregister=1 +# re-register if "openpkg" executable from community series +[ $reregister -eq 0 ] && @l_prefix@/bin/openpkg --license 2>/dev/null \ +| sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C' >/dev/null && reregister=1 +# re-register if "openpkg release" configured to pull packages directly from openpkg.(org|com|net) +[ $reregister -eq 0 ] && @l_prefix@/bin/openpkg release --fmt='%u' \ +| egrep '^[^:]*://(([^:]*:)?([EMAIL PROTECTED]@)?)?([^/]*\.)?openpkg\.(com|org|net)/' >/dev/null && reregister=1 +# perform (re-)registration +if [ $reregister -eq 1 ]; then [ $openpkg_reghour -lt 00 -o $openpkg_reghour -gt 23 ] && openpkg_reghour="3" now=`date '+%H'` [ $openpkg_reghour -eq $now ] || exit 0 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY rc
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Mar-2007 00:56:30 Branch: HEAD Handle: 2007031823562800 Modified files: openpkg-src/openpkg HISTORY rc Log: change "rc" to not check permissions for --print operations Summary: RevisionChanges Path 1.437 +1 -0 openpkg-src/openpkg/HISTORY 1.65+1 -1 openpkg-src/openpkg/rc patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.436 -r1.437 HISTORY --- openpkg-src/openpkg/HISTORY 18 Mar 2007 23:42:16 - 1.436 +++ openpkg-src/openpkg/HISTORY 18 Mar 2007 23:56:28 - 1.437 @@ -2,6 +2,7 @@ 2007 +20070319 change "rc" to not check permissions for --print operations 20070319 fix eval "rc" in rc.func which relies on PATH and conflicts with Plan 9 shell 20070319 RELEASE AS PART OF OPENPKG 2.20070319 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rc $ cvs diff -u -r1.64 -r1.65 rc --- openpkg-src/openpkg/rc1 Jan 2007 17:40:19 - 1.64 +++ openpkg-src/openpkg/rc18 Mar 2007 23:56:28 - 1.65 @@ -341,7 +341,7 @@ done # sanity check: is operation supported by current environment? -if [ ".$s_user" != ".$user" -a ".$user" != ".root" ]; then +if [ ".$s_user" != ".$user" -a ".$user" != ".root" -a ".$print" = .0 ]; then echo "openpkg:rc:ERROR: $s_name:%$cmd: require root privileges to run as user \"$s_user\"" 1>&2 exit 1 fi @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rc.func
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Mar-2007 00:42:18 Branch: HEAD Handle: 2007031823421601 Modified files: openpkg-src/openpkg HISTORY openpkg.spec rc.func Log: fix eval "rc" in rc.func which relies on PATH and conflicts with Plan 9 shell Summary: RevisionChanges Path 1.436 +5 -0 openpkg-src/openpkg/HISTORY 1.574 +1 -1 openpkg-src/openpkg/openpkg.spec 1.17+1 -1 openpkg-src/openpkg/rc.func patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.435 -r1.436 HISTORY --- openpkg-src/openpkg/HISTORY 5 Mar 2007 22:41:39 - 1.435 +++ openpkg-src/openpkg/HISTORY 18 Mar 2007 23:42:16 - 1.436 @@ -2,8 +2,13 @@ 2007 +20070319 fix eval "rc" in rc.func which relies on PATH and conflicts with Plan 9 shell + +20070319 RELEASE AS PART OF OPENPKG 2.20070319 20070305 invalidate passwd and group tables from Name Service Cache Daemon after pwconv 20070305 upgrade to rpmtool 1.1.0 remove dormant code for system user/group addition/removal + +20070303 RELEASE AS PART OF OPENPKG 2.20070303 20070302 upgrade to openpkg-registry 1.1.1 upgrade safety 20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./"); minor re fix in 1.4.4 20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.573 -r1.574 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 5 Mar 2007 22:41:40 - 1.573 +++ openpkg-src/openpkg/openpkg.spec 18 Mar 2007 23:42:17 - 1.574 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070305 +%define V_openpkg 20070319 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rc.func $ cvs diff -u -r1.16 -r1.17 rc.func --- openpkg-src/openpkg/rc.func 1 Jan 2007 17:40:19 - 1.16 +++ openpkg-src/openpkg/rc.func 18 Mar 2007 23:42:17 - 1.17 @@ -176,7 +176,7 @@ local chk="${3}" eval "local val=\$${var}" if [ ".${val}" = . ]; then -eval `rc ${1} status` +eval [EMAIL PROTECTED]@/bin/openpkg rc 2>/dev/null --silent ${1} status || true` eval "local val=\$${var}" fi if [ ".${val}" = ".${chk}" ]; then @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gdbm/ gdbm.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 07-Mar-2007 15:50:44 Branch: HEAD Handle: 2007030714504400 Modified files: openpkg-src/gdbmgdbm.spec Log: gdbm is GPL, not LGPL Summary: RevisionChanges Path 1.22+2 -2 openpkg-src/gdbm/gdbm.spec patch -p0 <<'@@ .' Index: openpkg-src/gdbm/gdbm.spec $ cvs diff -u -r1.21 -r1.22 gdbm.spec --- openpkg-src/gdbm/gdbm.spec1 Jan 2007 17:38:02 - 1.21 +++ openpkg-src/gdbm/gdbm.spec7 Mar 2007 14:50:44 - 1.22 @@ -31,9 +31,9 @@ Distribution: OpenPKG Community Class:BASE Group:Database -License: LGPL +License: GPL Version: 1.8.3 -Release: 20061013 +Release: 20070307 # package options %option with_ndbmyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Mar-2007 23:41:40 Branch: HEAD Handle: 2007030522413901 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: invalidate passwd and group tables from Name Service Cache Daemon after pwconv Summary: RevisionChanges Path 1.435 +1 -0 openpkg-src/openpkg/HISTORY 1.573 +15 -1 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.434 -r1.435 HISTORY --- openpkg-src/openpkg/HISTORY 5 Mar 2007 22:39:14 - 1.434 +++ openpkg-src/openpkg/HISTORY 5 Mar 2007 22:41:39 - 1.435 @@ -2,6 +2,7 @@ 2007 +20070305 invalidate passwd and group tables from Name Service Cache Daemon after pwconv 20070305 upgrade to rpmtool 1.1.0 remove dormant code for system user/group addition/removal 20070302 upgrade to openpkg-registry 1.1.1 upgrade safety 20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./"); minor re fix in 1.4.4 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.572 -r1.573 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 2 Mar 2007 10:10:51 - 1.572 +++ openpkg-src/openpkg/openpkg.spec 5 Mar 2007 22:41:40 - 1.573 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070302 +%define V_openpkg 20070305 # the used software versions %define V_rpm 4.2.1 @@ -1840,6 +1840,13 @@ fi done +# invalidate passwd and group tables from Name Service Cache Daemon to +# ensure chown/chgrp works immediately after pwconv on Linux and Solaris +if [ -x /usr/sbin/nscd ]; then +/usr/sbin/nscd -i passwd >/dev/null 2>&1 || true +/usr/sbin/nscd -i group >/dev/null 2>&1 || true +fi + # create the startup/shutdown transfer script name=`echo "$prefix" | sed -e 's;/;;g'` if [ ".$cusr" != ".root" ]; then @@ -2613,6 +2620,13 @@ fi done +# invalidate passwd and group tables from Name Service Cache Daemon to +# ensure chown/chgrp works immediately after pwconv on Linux and Solaris +if [ -x /usr/sbin/nscd ]; then +/usr/sbin/nscd -i passwd >/dev/null 2>&1 || true +/usr/sbin/nscd -i group >/dev/null 2>&1 || true +fi + # remove the startup/shutdown transfer scripts name=`echo "$prefix" | sed -e 's;/;;g'` if [ ".$cusr" != ".root" ]; then @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY rpmtool rpmtool.8 rpmtool....
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Mar-2007 23:39:15 Branch: HEAD Handle: 2007030522391400 Modified files: openpkg-src/openpkg HISTORY rpmtool rpmtool.8 rpmtool.pod Log: remove dormant code for system user/group addition/removal from rpmtool Summary: RevisionChanges Path 1.434 +1 -0 openpkg-src/openpkg/HISTORY 1.54+2 -286openpkg-src/openpkg/rpmtool 1.13+0 -6 openpkg-src/openpkg/rpmtool.8 1.18+0 -8 openpkg-src/openpkg/rpmtool.pod patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.433 -r1.434 HISTORY --- openpkg-src/openpkg/HISTORY 5 Mar 2007 22:33:08 - 1.433 +++ openpkg-src/openpkg/HISTORY 5 Mar 2007 22:39:14 - 1.434 @@ -2,6 +2,7 @@ 2007 +20070305 upgrade to rpmtool 1.1.0 remove dormant code for system user/group addition/removal 20070302 upgrade to openpkg-registry 1.1.1 upgrade safety 20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./"); minor re fix in 1.4.4 20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmtool $ cvs diff -u -r1.53 -r1.54 rpmtool --- openpkg-src/openpkg/rpmtool 4 Feb 2007 22:57:31 - 1.53 +++ openpkg-src/openpkg/rpmtool 5 Mar 2007 22:39:14 - 1.54 @@ -25,8 +25,8 @@ prog_path="$0" prog_name="rpmtool" -prog_vers="1.0.2" -prog_date="03-Aug-2001" +prog_vers="1.1.0" +prog_date="05-Mar-2007" if [ $# -eq 0 ]; then echo "$0:Error: invalid command line" 1>&2 @@ -51,9 +51,6 @@ echo ' cppflags [-p ] [ ...]' echo ' ldflags [-p ] [ ...]' echo ' files [-v] [-o ] [-r ] []' -echo ' user [-c] [-d] [-p ] [-n ] [-d ]' -echo ' [-s ] [-u ] ' -echo ' group [-c] [-d] [ ...]' echo ' signal [-v] [-t] [-n] [-c] [-d ] [-p ] [-m ] [ ...]' echo ' config [-v] [-s] [-a] [-r] [-b ] [-p ] [-t ] [-i ] ' echo ' msg[-b] [-r] [-t ]' @@ -115,26 +112,6 @@ opt_o='' opt_r='' ;; -user ) -str_usage="[-a] [-r] [-p ] [-n ] [-d ] [-s ] [-u ] " -arg_spec="1=" -opt_spec="a.r.p:n:d:s:u:" -opt_a=no -opt_r=no -opt_p='' -opt_n='' -opt_d='' -opt_s='' -opt_u=1000 -;; -group ) -str_usage="[-a] [-r] [-g ] [ ...]" -arg_spec="1+" -opt_spec="a.r.g:" -opt_a=no -opt_r=no -opt_g=1000 -;; signal ) str_usage="[-v] [-t] [-n] [-c] [-d ] [-p ] [-m ] [ ...]" arg_spec="1+" @@ -912,267 +889,6 @@ fi ;; -user ) -# calling convention -if [ ".$opt_a" = .no -a ".$opt_r" = .no ]; then -echo "$msgprefix:Error: either -a or -r has to be given" 1>&2 -exit 1 -fi -if [ ".$opt_a" = .yes -a ".$opt_r" = .yes ]; then -echo "$msgprefix:Error: only -a or -r can be given" 1>&2 -exit 1 -fi -user=$1 - -# default values -if [ ".$opt_n" = . ]; then -opt_n="$user" -fi -if [ ".$opt_s" = . ]; then -opt_s=`which false 2>/dev/null` -if [ ".$opt_s" = . ]; then -opt_s="/bin/false" -fi -fi -if [ ".$opt_d" = . ]; then -opt_d="/nowhere" -fi - -# add user -if [ ".$opt_a" = .yes ]; then -case "$platform" in -*:Darwin:*:* ) -
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Mar-2007 23:33:08 Branch: HEAD Handle: 2007030522330800 Modified files: openpkg-src/openpkg HISTORY Log: mention minor re fix Summary: RevisionChanges Path 1.433 +1 -1 openpkg-src/openpkg/HISTORY patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.432 -r1.433 HISTORY --- openpkg-src/openpkg/HISTORY 2 Mar 2007 10:10:51 - 1.432 +++ openpkg-src/openpkg/HISTORY 5 Mar 2007 22:33:08 - 1.433 @@ -3,7 +3,7 @@ 20070302 upgrade to openpkg-registry 1.1.1 upgrade safety -20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./") +20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./"); minor re fix in 1.4.4 20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") 20070223 upgrade to OpenSSL 0.9.8e 20070222 upgrade to openpkg-tools 1.4.1 avoid "openpkg curl" to emit confusing "error trying read config" messages @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/fsl/ fsl.spec openpkg-src...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 03-Mar-2007 21:17:47 Branch: OPENPKG_2_STABLE Handle: 2007030320173905 Modified files: (Branch: OPENPKG_2_STABLE) openpkg-src/fsl fsl.spec openpkg-src/gcc gcc.spec openpkg-src/openpkg HISTORY openpkg.spec openpkg-src/openssh openssh.spec openpkg-src/openssl openssl.patch openssl.spec Log: MFC: make up leeway for 2_STABLE by virtue of build-time results Summary: RevisionChanges Path 1.83.2.3+5 -4 openpkg-src/fsl/fsl.spec 1.127.2.4 +4 -4 openpkg-src/gcc/gcc.spec 1.337.2.20 +7 -0 openpkg-src/openpkg/HISTORY 1.490.2.20 +5 -5 openpkg-src/openpkg/openpkg.spec 1.161.2.13 +4 -3 openpkg-src/openssh/openssh.spec 1.23.2.1+47 -0 openpkg-src/openssl/openssl.patch 1.73.2.6+2 -2 openpkg-src/openssl/openssl.spec patch -p0 <<'@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.83.2.2 -r1.83.2.3 fsl.spec --- openpkg-src/fsl/fsl.spec 16 Oct 2006 14:50:09 - 1.83.2.2 +++ openpkg-src/fsl/fsl.spec 3 Mar 2007 20:17:42 - 1.83.2.3 @@ -1,7 +1,7 @@ ## ## fsl.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/> -## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/> +## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -32,8 +32,8 @@ Class:CORE Group:Libraries License: MIT-style -Version: 1.6.1 -Release: 2.20061018 +Version: 1.7.0 +Release: 2.20070303 # package options %option with_fsl_debuglogcode no @@ -77,6 +77,7 @@ %build CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ +GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ %if "%{with_fsl_debuglogcode}" == "yes" @@ . patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.127.2.3 -r1.127.2.4 gcc.spec --- openpkg-src/gcc/gcc.spec 21 Dec 2006 18:42:07 - 1.127.2.3 +++ openpkg-src/gcc/gcc.spec 3 Mar 2007 20:17:41 - 1.127.2.4 @@ -1,7 +1,7 @@ ## ## gcc.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/> -## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/> +## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/> +## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/> ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -23,7 +23,7 @@ ## # package version -%define V_full 4.1.1 +%define V_full 4.1.2 %define V_comp %nil # package information @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 2.20061221 +Release: 2.20070303 # package options %option with_cxx yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.337.2.19 -r1.337.2.20 HISTORY --- openpkg-src/openpkg/HISTORY 21 Feb 2007 17:22:11 - 1.337.2.19 +++ openpkg-src/openpkg/HISTORY 3 Mar 2007 20:17:39 - 1.337.2.20 @@ -2,6 +2,13 @@ 2007 +20070303 RELEASE AS PART OF OPENPKG 2.20070303 +20070302 upgrade to openpkg-registry 1.1.1 upgrade safety +20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./") +20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") +20070223 upgrade to OpenSSL 0.9.8e +20070222 upgrade to openpkg-tools 1.4.1 avoid "openpkg curl" to emit confusin
[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 23:12:27 Branch: HEAD Handle: 2007030222122600 Modified files: openpkg-src/openpkg-registry openpkg-registry.spec Log: bless for PLUS class Summary: RevisionChanges Path 1.35+1 -1 openpkg-src/openpkg-registry/openpkg-registry.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg-registry/openpkg-registry.spec $ cvs diff -u -r1.34 -r1.35 openpkg-registry.spec --- openpkg-src/openpkg-registry/openpkg-registry.spec2 Mar 2007 18:17:37 - 1.34 +++ openpkg-src/openpkg-registry/openpkg-registry.spec2 Mar 2007 22:12:26 - 1.35 @@ -29,7 +29,7 @@ Vendor: OpenPKG Packager: OpenPKG Foundation e.V. Distribution: OpenPKG Community -Class:EVAL +Class:PLUS Group:Bootstrapping License: BSD-style Version: 1.1.1 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fsl/ fsl.spec openpkg-src/l2/ l2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 23:07:52 Branch: HEAD Handle: 2007030222075100 Modified files: openpkg-src/fsl fsl.spec openpkg-src/l2 l2.spec Log: apply the usual Solaris Autoconf workaround Summary: RevisionChanges Path 1.89+1 -0 openpkg-src/fsl/fsl.spec 1.38+1 -0 openpkg-src/l2/l2.spec patch -p0 <<'@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.88 -r1.89 fsl.spec --- openpkg-src/fsl/fsl.spec 2 Mar 2007 17:14:22 - 1.88 +++ openpkg-src/fsl/fsl.spec 2 Mar 2007 22:07:51 - 1.89 @@ -77,6 +77,7 @@ %build CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ +GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ %if "%{with_fsl_debuglogcode}" == "yes" @@ . patch -p0 <<'@@ .' Index: openpkg-src/l2/l2.spec $ cvs diff -u -r1.37 -r1.38 l2.spec --- openpkg-src/l2/l2.spec2 Mar 2007 17:14:22 - 1.37 +++ openpkg-src/l2/l2.spec2 Mar 2007 22:07:51 - 1.38 @@ -84,6 +84,7 @@ %build CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ +GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ --disable-shared @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fsl/ fsl.spec openpkg-src/l2/ l2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 18:14:22 Branch: HEAD Handle: 2007030217142200 Modified files: openpkg-src/fsl fsl.spec openpkg-src/l2 l2.spec Log: large file support for l2_ch_file, motivated by the Kolab-Konsortium Summary: RevisionChanges Path 1.88+2 -2 openpkg-src/fsl/fsl.spec 1.37+2 -2 openpkg-src/l2/l2.spec patch -p0 <<'@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.87 -r1.88 fsl.spec --- openpkg-src/fsl/fsl.spec 1 Jan 2007 17:37:56 - 1.87 +++ openpkg-src/fsl/fsl.spec 2 Mar 2007 17:14:22 - 1.88 @@ -32,8 +32,8 @@ Class:CORE Group:Libraries License: MIT-style -Version: 1.6.1 -Release: 20061013 +Version: 1.7.0 +Release: 20070302 # package options %option with_fsl_debuglogcode no @@ . patch -p0 <<'@@ .' Index: openpkg-src/l2/l2.spec $ cvs diff -u -r1.36 -r1.37 l2.spec --- openpkg-src/l2/l2.spec1 Jan 2007 17:38:59 - 1.36 +++ openpkg-src/l2/l2.spec2 Mar 2007 17:14:22 - 1.37 @@ -32,8 +32,8 @@ Class:PLUS Group:Libraries License: MIT-style -Version: 0.9.11 -Release: 20061013 +Version: 0.9.12 +Release: 20070302 # list of sources Source0: ftp://ftp.ossp.org/pkg/lib/l2/l2-%{version}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 11:10:52 Branch: HEAD Handle: 2007030210105100 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: modifying package: openpkg-20070302 20070302 again Summary: RevisionChanges Path 1.432 +1 -0 openpkg-src/openpkg/HISTORY 1.572 +1 -1 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.431 -r1.432 HISTORY --- openpkg-src/openpkg/HISTORY 2 Mar 2007 08:56:10 - 1.431 +++ openpkg-src/openpkg/HISTORY 2 Mar 2007 10:10:51 - 1.432 @@ -2,6 +2,7 @@ 2007 +20070302 upgrade to openpkg-registry 1.1.1 upgrade safety 20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./") 20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") 20070223 upgrade to OpenSSL 0.9.8e @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.571 -r1.572 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 2 Mar 2007 09:51:54 - 1.571 +++ openpkg-src/openpkg/openpkg.spec 2 Mar 2007 10:10:51 - 1.572 @@ -55,7 +55,7 @@ %define V_bash 3.2 %define V_uuid 1.5.1 %define V_config 20060923 -%define V_registry 1.1.0 +%define V_registry 1.1.1 %define V_perl 5.8.8 %define V_openssl 0.9.8e %define V_tools1.4.4 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 02-Mar-2007 11:06:17 Branch: HEAD Handle: 2007030210061601 Modified files: openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl registry.pm Log: bump before release Summary: RevisionChanges Path 1.32+1 -1 openpkg-registry/VERSION 1.63+2 -2 openpkg-registry/register.sh 1.57+2 -2 openpkg-registry/registry-db.pl 1.106 +2 -2 openpkg-registry/registry-ui.pl 1.14+2 -2 openpkg-registry/registry.pm patch -p0 <<'@@ .' Index: openpkg-registry/VERSION $ cvs diff -u -r1.31 -r1.32 VERSION --- openpkg-registry/VERSION 20 Feb 2007 22:13:12 - 1.31 +++ openpkg-registry/VERSION 2 Mar 2007 10:06:16 - 1.32 @@ -2,5 +2,5 @@ VERSION -- Version Information for OpenPKG Registry (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OpenPKG Registry, Version 1.1.0 (20-Feb-2007) + This is OpenPKG Registry, Version 1.1.1 (02-Mar-2007) @@ . patch -p0 <<'@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.62 -r1.63 register.sh --- openpkg-registry/register.sh 2 Mar 2007 10:06:03 - 1.62 +++ openpkg-registry/register.sh 2 Mar 2007 10:06:17 - 1.63 @@ -29,8 +29,8 @@ # program name, version and date progname="register" -progvers="1.1.0" -progdate="20-Feb-2007" +progvers="1.1.1" +progdate="02-Mar-2007" # determine path to OpenPKG instance PREFIX="@l_prefix@" @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-db.pl $ cvs diff -u -r1.56 -r1.57 registry-db.pl --- openpkg-registry/registry-db.pl 20 Feb 2007 22:13:12 - 1.56 +++ openpkg-registry/registry-db.pl 2 Mar 2007 10:06:17 - 1.57 @@ -34,8 +34,8 @@ # program name, version and date my $progname="registry-db.pl"; -my $progvers="1.1.0"; -my $progdate="20-Feb-2007"; +my $progvers="1.1.1"; +my $progdate="02-Mar-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry-ui.pl $ cvs diff -u -r1.105 -r1.106 registry-ui.pl --- openpkg-registry/registry-ui.pl 20 Feb 2007 22:13:12 - 1.105 +++ openpkg-registry/registry-ui.pl 2 Mar 2007 10:06:17 - 1.106 @@ -41,8 +41,8 @@ # program name, version and date my $progname="registry-ui.pl"; -my $progvers="1.1.0"; -my $progdate="20-Feb-2007"; +my $progvers="1.1.1"; +my $progdate="02-Mar-2007"; # configure data dumper $Data::Dumper::Purity = 1; @@ . patch -p0 <<'@@ .' Index: openpkg-registry/registry.pm $ cvs diff -u -r1.13 -r1.14 registry.pm --- openpkg-registry/registry.pm 20 Feb 2007 22:13:12 - 1.13 +++ openpkg-registry/registry.pm 2 Mar 2007 10:06:17 - 1.14 @@ -30,8 +30,8 @@ # program name, version and date my $progname="registry.pm"; -my $progvers="1.1.0"; -my $progdate="20-Feb-2007"; +my $progvers="1.1.1"; +my $progdate="02-Mar-2007"; # get configuration file name # @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ register.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 02-Mar-2007 11:06:03 Branch: HEAD Handle: 2007030210060300 Modified files: openpkg-registryregister.sh Log: upgrade safety (compensate incorrect values in conf and util files that may occur on weird upgrade pathes) Summary: RevisionChanges Path 1.62+16 -0 openpkg-registry/register.sh patch -p0 <<'@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.61 -r1.62 register.sh --- openpkg-registry/register.sh 20 Feb 2007 22:19:24 - 1.61 +++ openpkg-registry/register.sh 2 Mar 2007 10:06:03 - 1.62 @@ -72,6 +72,14 @@ { [ ".$REGISTRY_CONF" = . ] && return if [ -r "$REGISTRY_CONF" ]; then + +# upgrade safety for changed variable name +# please remove this code after 2007-06 snapshot +"$PREFIX/lib/openpkg/shtool" subst \ +-e 's;^\( *REGISTRY_UUID *= *"[^/].*\)$;#\1;' \ +"$REGISTRY_CONF" \ +>/dev/null 2>&1 || true + sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF" fi } @@ -80,6 +88,14 @@ { [ ".$REGISTRY_UUID" = . ] && return if [ -r "$REGISTRY_UUID" ]; then + +# upgrade safety for changed variable name +# please remove this code after 2007-06 snapshot +"$PREFIX/lib/openpkg/shtool" subst \ +-e 's;^ *REGISTRY_UUID *=;REGISTRY_DBID=;' \ +"$REGISTRY_UUID" \ +>/dev/null 2>&1 || true + sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID" fi } @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 10:51:55 Branch: HEAD Handle: 2007030209515400 Modified files: openpkg-src/openpkg openpkg.spec Log: modifying package: openpkg-20070302 20070302 again Summary: RevisionChanges Path 1.571 +1 -1 openpkg-src/openpkg/openpkg.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.570 -r1.571 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 2 Mar 2007 08:56:11 - 1.570 +++ openpkg-src/openpkg/openpkg.spec 2 Mar 2007 09:51:54 - 1.571 @@ -58,7 +58,7 @@ %define V_registry 1.1.0 %define V_perl 5.8.8 %define V_openssl 0.9.8e -%define V_tools1.4.3 +%define V_tools1.4.4 %define V_exec 2.0.0-C # package information @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg-tools/ openpkg-tools.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Mar-2007 10:51:32 Branch: HEAD Handle: 2007030209513200 Modified files: openpkg-src/openpkg-tools openpkg-tools.spec Log: upgrading package: openpkg-tools 1.4.3 -> 1.4.4 Summary: RevisionChanges Path 1.107 +1 -1 openpkg-src/openpkg-tools/openpkg-tools.spec patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tools/openpkg-tools.spec $ cvs diff -u -r1.106 -r1.107 openpkg-tools.spec --- openpkg-src/openpkg-tools/openpkg-tools.spec 2 Mar 2007 08:52:12 - 1.106 +++ openpkg-src/openpkg-tools/openpkg-tools.spec 2 Mar 2007 09:51:32 - 1.107 @@ -32,7 +32,7 @@ Class:BASE Group:Bootstrapping License: MIT -Version: 1.4.3 +Version: 1.4.4 Release: 20070302 # package options @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/ VERSION
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 02-Mar-2007 10:49:43 Branch: HEAD Handle: 2007030209494300 Modified files: openpkg-tools VERSION Log: bump before release Summary: RevisionChanges Path 1.98+1 -1 openpkg-tools/VERSION patch -p0 <<'@@ .' Index: openpkg-tools/VERSION $ cvs diff -u -r1.97 -r1.98 VERSION --- openpkg-tools/VERSION 2 Mar 2007 08:51:14 - 1.97 +++ openpkg-tools/VERSION 2 Mar 2007 09:49:43 - 1.98 @@ -2,5 +2,5 @@ VERSION -- Version Information for OpenPKG Tool Chain (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OpenPKG Tool Chain, Version 1.4.3 (02-Mar-2007) + This is OpenPKG Tool Chain, Version 1.4.4 (02-Mar-2007) @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org