[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 19:04:53
Branch: HEAD Handle: 2008032818045200
Modified files:
openpkg-src/drupal drupal.spec
Log:
add TinyMCE WYSIWYG editor
Summary:
RevisionChanges Path
1.179 +30 -17 openpkg-src/drupal/drupal.spec
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
$ cvs diff -u -r1.178 -r1.179 drupal.spec
--- openpkg-src/drupal/drupal.spec28 Mar 2008 17:08:21 - 1.178
+++ openpkg-src/drupal/drupal.spec28 Mar 2008 18:04:52 - 1.179
@@ -127,6 +127,7 @@
%define V_module_textsize6.x-1.x-dev
%define V_module_texy6.x-1.0-beta1
%define V_module_themesettingsapi6.x-1.3
+%define V_module_tinymce 6.x-1.x-dev
%define V_module_token 6.x-1.10
%define V_module_trackback 6.x-1.0
%define V_module_trash 6.x-1.x-dev
@@ -162,6 +163,7 @@
%define V_aux_fckeditor 2.5.1
%define V_aux_geshi 1.0.7.20
%define V_aux_simplepie 1.1
+%define V_aux_tinymce3_0_5
# package information
Name: drupal
@@ -293,23 +295,24 @@
Source100:
http://ftp.drupal.org/files/projects/textsize-%{V_module_textsize}.tar.gz
Source101:
http://ftp.drupal.org/files/projects/texy-%{V_module_texy}.tar.gz
Source102:
http://ftp.drupal.org/files/projects/themesettingsapi-%{V_module_themesettingsapi}.tar.gz
-Source103:
http://ftp.drupal.org/files/projects/token-%{V_module_token}.tar.gz
-Source104:
http://ftp.drupal.org/files/projects/trackback-%{V_module_trackback}.tar.gz
-Source105:
http://ftp.drupal.org/files/projects/trash-%{V_module_trash}.tar.gz
-Source106:
http://ftp.drupal.org/files/projects/twikifilter-%{V_module_twikifilter}.tar.gz
-Source107:
http://ftp.drupal.org/files/projects/util-%{V_module_util}.tar.gz
-Source108:
http://ftp.drupal.org/files/projects/views-%{V_module_views}.tar.gz
-Source109:
http://ftp.drupal.org/files/projects/virtual_site-%{V_module_virtual_site}.tar.gz
-Source110:
http://ftp.drupal.org/files/projects/votingapi-%{V_module_votingapi}.tar.gz
-Source111:
http://ftp.drupal.org/files/projects/weather-%{V_module_weather}.tar.gz
-Source112:
http://ftp.drupal.org/files/projects/wishlist-%{V_module_wishlist}.tar.gz
-Source113:
http://ftp.drupal.org/files/projects/xmlsitemap-%{V_module_xmlsitemap}.tar.gz
-Source114:
http://ftp.drupal.org/files/projects/xstandard-%{V_module_xstandard}.tar.gz
-Source115:http://ftp.drupal.org/files/projects/yui-%{V_module_yui}.tar.gz
-Source116:
http://ftp.drupal.org/files/projects/yui_calendar-%{V_module_yui_calendar}.tar.gz
-Source117:
http://ftp.drupal.org/files/projects/yui_editor-%{V_module_yui_editor}.tar.gz
-Source118:
http://ftp.drupal.org/files/projects/yuimenu-%{V_module_yuimenu}.tar.gz
-Source119:
http://ftp.drupal.org/files/projects/zeitgeist-%{V_module_zeitgeist}.tar.gz
+Source103:
http://ftp.drupal.org/files/projects/tinymce-%{V_module_tinymce}.tar.gz
+Source104:
http://ftp.drupal.org/files/projects/token-%{V_module_token}.tar.gz
+Source105:
http://ftp.drupal.org/files/projects/trackback-%{V_module_trackback}.tar.gz
+Source106:
http://ftp.drupal.org/files/projects/trash-%{V_module_trash}.tar.gz
+Source107:
http://ftp.drupal.org/files/projects/twikifilter-%{V_module_twikifilter}.tar.gz
+Source108:
http://ftp.drupal.org/files/projects/util-%{V_module_util}.tar.gz
+Source109:
http://ftp.drupal.org/files/projects/views-%{V_module_views}.tar.gz
+Source110:
http://ftp.drupal.org/files/projects/virtual_site-%{V_module_virtual_site}.tar.gz
+Source111:
http://ftp.drupal.org/files/projects/votingapi-%{V_module_votingapi}.tar.gz
+Source112:
http://ftp.drupal.org/files/projects/weather-%{V_module_weather}.tar.gz
+Source113:
http://ftp.drupal.org/files/projects/wishlist-%{V_module_wishlist}.tar.gz
+Source114:
http://ftp.drupal.org/files/projects/xmlsitemap-%{V_module_xmlsitemap}.tar.gz
+Source115:
http://ftp.drupal.org/files/projects/xstandard-%{V_module_xstandard}.tar.gz
+Source116:http://ftp.drupal.org/files/projects/yui-%{V_module_yui}.tar.gz
+Source117:
http://ftp.drupal.org/files/projects/yui_calendar-%{V_module_yui_calendar}.tar.gz
+Source118:
htt
[CVS] OpenPKG: openpkg-src/git/ git.patch git.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 18:41:21
Branch: HEAD Handle: 2008032817412000
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.5.4.4 -> 1.5.4.5
Summary:
RevisionChanges Path
1.57+6 -6 openpkg-src/git/git.patch
1.96+2 -2 openpkg-src/git/git.spec
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
$ cvs diff -u -r1.56 -r1.57 git.patch
--- openpkg-src/git/git.patch 25 Mar 2008 07:28:33 - 1.56
+++ openpkg-src/git/git.patch 28 Mar 2008 17:41:20 - 1.57
@@ -12,9 +12,9 @@
INSTALL?=install
-Index: git-1.5.4.4/Makefile
git-1.5.4.4/Makefile.orig2008-02-02 05:09:01 +0100
-+++ git-1.5.4.4/Makefile 2008-02-02 17:12:28 +0100
+Index: git-1.5.4.5/Makefile
+--- git-1.5.4.5/Makefile.orig2008-02-02 05:09:01 +0100
git-1.5.4.5/Makefile 2008-02-02 17:12:28 +0100
@@ -162,7 +162,7 @@
infodir = $(prefix)/share/info
gitexecdir = $(bindir)
@@ -38,9 +38,9 @@
endif
BUILTIN_OBJS += builtin-http-fetch.o
EXTLIBS += $(CURL_LIBCURL)
-Index: git-1.5.4.4/perl/Makefile.PL
git-1.5.4.4/perl/Makefile.PL.orig2008-02-02 05:09:01 +0100
-+++ git-1.5.4.4/perl/Makefile.PL 2008-02-02 17:12:53 +0100
+Index: git-1.5.4.5/perl/Makefile.PL
+--- git-1.5.4.5/perl/Makefile.PL.orig2008-02-02 05:09:01 +0100
git-1.5.4.5/perl/Makefile.PL 2008-02-02 17:12:53 +0100
@@ -26,5 +26,5 @@
VERSION_FROM=> 'Git.pm',
PM => \%pm,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
$ cvs diff -u -r1.95 -r1.96 git.spec
--- openpkg-src/git/git.spec 25 Mar 2008 07:28:33 - 1.95
+++ openpkg-src/git/git.spec 28 Mar 2008 17:41:20 - 1.96
@@ -22,7 +22,7 @@
##
# package version
-%define V_git 1.5.4.4
+%define V_git 1.5.4.5
%define V_cogito0.18.2
%define V_stgit 0.14.2
%define V_guilt 0.29
@@ -39,7 +39,7 @@
Group:SCM
License: GPL
Version: %{V_git}
-Release: 20080325
+Release: 20080328
# package options
%option with_cogito yes
@@ .
__
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: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 18:08:22
Branch: HEAD Handle: 2008032817082100
Modified files:
openpkg-src/drupal drupal.spec
Log:
modifying package: drupal-6.1 20080327 -> 20080328
Summary:
RevisionChanges Path
1.178 +3 -3 openpkg-src/drupal/drupal.spec
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
$ cvs diff -u -r1.177 -r1.178 drupal.spec
--- openpkg-src/drupal/drupal.spec27 Mar 2008 19:17:53 - 1.177
+++ openpkg-src/drupal/drupal.spec28 Mar 2008 17:08:21 - 1.178
@@ -70,13 +70,13 @@
%define V_module_forum_access6.x-1.x-dev
%define V_module_freelinking 6.x-1.2
%define V_module_geshifilter 6.x-1.0-rc2
-%define V_module_glossary6.x-1.0
+%define V_module_glossary6.x-1.1
%define V_module_helpers 6.x-1.1-beta1
%define V_module_http_action 6.x-1.x-dev
%define V_module_iconizer6.x-1.x-dev
%define V_module_image 6.x-1.x-dev
%define V_module_image_caption 6.x-2.x-dev
-%define V_module_img_filter 6.x-1.5
+%define V_module_img_filter 6.x-1.6
%define V_module_int_meta6.x-1.0-beta
%define V_module_jquery_plugin 6.x-1.2
%define V_module_jscrollpane 6.x-1.0
@@ -174,7 +174,7 @@
Group:CMS
License: GPL
Version: %{V_drupal}
-Release: 20080327
+Release: 20080328
# package options
%option with_mysql yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/stunnel/ stunnel.patch stunnel.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 18:07:02
Branch: HEAD Handle: 2008032817070100
Modified files:
openpkg-src/stunnel stunnel.patch stunnel.spec
Log:
upgrading package: stunnel 4.21 -> 4.22
Summary:
RevisionChanges Path
1.8 +7 -7 openpkg-src/stunnel/stunnel.patch
1.83+2 -2 openpkg-src/stunnel/stunnel.spec
patch -p0 <<'@@ .'
Index: openpkg-src/stunnel/stunnel.patch
$ cvs diff -u -r1.7 -r1.8 stunnel.patch
--- openpkg-src/stunnel/stunnel.patch 12 Nov 2006 10:21:53 - 1.7
+++ openpkg-src/stunnel/stunnel.patch 28 Mar 2008 17:07:01 - 1.8
@@ -10,14 +10,14 @@
#include
#include
Index: tools/Makefile.in
tools/Makefile.in.orig 2006-11-01 13:48:13 +0100
-+++ tools/Makefile.in2006-11-12 11:18:48 +0100
-@@ -390,7 +390,7 @@
+--- tools/Makefile.in.orig 2007-11-01 18:45:14.0 +0100
tools/Makefile.in2008-03-28 18:04:57.0 +0100
+@@ -395,7 +395,7 @@
${INSTALL} -m 600 stunnel.pem $(DESTDIR)$(confdir)/stunnel.pem;
\
rm stunnel.pem; \
fi
--${INSTALL} -d -m 1770 $(DESTDIR)$(prefix)/var/lib/stunnel
-+${INSTALL} -d -m 0770 $(DESTDIR)$(prefix)/var/lib/stunnel
- -chgrp $(DEFAULT_GROUP) $(DESTDIR)$(prefix)/var/lib/stunnel
+-${INSTALL} -d -m 1770 $(DESTDIR)$(localstatedir)/lib/stunnel
++${INSTALL} -d -m 0770 $(DESTDIR)$(localstatedir)/lib/stunnel
+ -chgrp $(DEFAULT_GROUP) $(DESTDIR)$(localstatedir)/lib/stunnel
if uname | grep SunOS; then \
- ${INSTALL} -d -m 755 $(DESTDIR)$(prefix)/var/lib/stunnel/dev; \
+ ${INSTALL} -d -m 755
$(DESTDIR)$(localstatedir)/lib/stunnel/dev; \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/stunnel/stunnel.spec
$ cvs diff -u -r1.82 -r1.83 stunnel.spec
--- openpkg-src/stunnel/stunnel.spec 1 Jan 2008 15:05:28 - 1.82
+++ openpkg-src/stunnel/stunnel.spec 28 Mar 2008 17:07:01 - 1.83
@@ -31,8 +31,8 @@
Class:BASE
Group:SSL
License: GPL
-Version: 4.21
-Release: 20080101
+Version: 4.22
+Release: 20080328
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/netpbm/ netpbm.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 18:03:15
Branch: HEAD Handle: 2008032817031400
Modified files:
openpkg-src/netpbm netpbm.spec
Log:
upgrading package: netpbm 10.26.51 -> 10.26.52
Summary:
RevisionChanges Path
1.108 +2 -2 openpkg-src/netpbm/netpbm.spec
patch -p0 <<'@@ .'
Index: openpkg-src/netpbm/netpbm.spec
$ cvs diff -u -r1.107 -r1.108 netpbm.spec
--- openpkg-src/netpbm/netpbm.spec9 Mar 2008 07:25:11 - 1.107
+++ openpkg-src/netpbm/netpbm.spec28 Mar 2008 17:03:14 - 1.108
@@ -31,8 +31,8 @@
Class:BASE
Group:Graphics
License: MIT-style
-Version: 10.26.51
-Release: 20080309
+Version: 10.26.52
+Release: 20080328
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bash/ bash.patch bash.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 15:32:19
Branch: HEAD Handle: 2008032814321900
Modified files:
openpkg-src/bashbash.patch bash.spec
Log:
update patch file to fit exactly fitout fuzzy matching requirements
Summary:
RevisionChanges Path
1.17+11 -11 openpkg-src/bash/bash.patch
1.98+1 -1 openpkg-src/bash/bash.spec
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
$ cvs diff -u -r1.16 -r1.17 bash.patch
--- openpkg-src/bash/bash.patch 10 Jul 2007 16:58:12 - 1.16
+++ openpkg-src/bash/bash.patch 28 Mar 2008 14:32:19 - 1.17
@@ -2,8 +2,8 @@
line options "-v" and "-x". It is derived from Debian GNU/Linux.
Index: doc/bash.1
doc/bash.1.orig 2004-07-12 17:27:08 +0200
-+++ doc/bash.1 2004-07-27 19:47:10 +0200
+--- doc/bash.1.orig 2006-10-03 14:54:26 +0200
doc/bash.1 2008-03-28 15:28:44 +0100
@@ -116,6 +116,12 @@
This option allows the positional parameters to be set
when invoking an interactive shell.
@@ -16,15 +16,15 @@
+.TP
.B \-D
A list of all double-quoted strings preceded by \fB$\fP
- is printed on the standard ouput.
+ is printed on the standard output.
-
Port to HP-UX 11i and similar less smart platforms.
Index: configure
configure.orig 2004-07-21 22:18:56 +0200
-+++ configure2004-07-27 19:47:10 +0200
+--- configure.orig 2006-09-26 17:06:01 +0200
configure2008-03-28 15:28:44 +0100
@@ -1517,6 +1517,7 @@
*-beos*)opt_bash_malloc=no ;; # they say it's suitable
*-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment
@@ -43,8 +43,8 @@
MALLOC_DEP=
fi
Index: syntax.h
syntax.h.orig2004-04-15 05:19:36 +0200
-+++ syntax.h 2004-07-27 19:47:10 +0200
+--- syntax.h.orig2006-06-22 19:45:22 +0200
syntax.h 2008-03-28 15:28:44 +0100
@@ -21,6 +21,8 @@
#ifndef _SYNTAX_H_
#define _SYNTAX_H_
@@ -60,8 +60,8 @@
This adds the OpenPKG packaging brand.
Index: version.c
version.c.orig 2003-12-19 22:34:02 +0100
-+++ version.c2004-07-27 19:47:10 +0200
+--- version.c.orig 2005-05-16 17:58:34 +0200
version.c2008-03-28 15:28:44 +0100
@@ -77,7 +77,7 @@
show_shell_version (extended)
int extended;
@@ -69,7 +69,7 @@
- printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
+ printf ("GNU bash, version %s (%s) [EMAIL PROTECTED]@]\n",
shell_version_string (), MACHTYPE);
if (extended)
- printf (_("Copyright (C) 2004 Free Software Foundation, Inc.\n"));
+ printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
}
-
@@ -78,7 +78,7 @@
Index: Makefile.in
--- Makefile.in.orig 2006-08-17 20:03:35 +0200
-+++ Makefile.in 2007-07-10 18:50:38 +0200
Makefile.in 2008-03-28 15:28:44 +0100
@@ -687,7 +687,6 @@
# comment out for distribution
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
$ cvs diff -u -r1.97 -r1.98 bash.spec
--- openpkg-src/bash/bash.spec1 Jan 2008 14:51:15 - 1.97
+++ openpkg-src/bash/bash.spec28 Mar 2008 14:32:19 - 1.98
@@ -38,7 +38,7 @@
Group:Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20080101
+Release: 20080328
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl/ perl.patch perl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 15:28:21
Branch: HEAD Handle: 2008032814282100
Modified files:
openpkg-src/perlperl.patch perl.spec
Log:
update patch file to fit exactly fitout fuzzy matching requirements
Summary:
RevisionChanges Path
1.26+29 -29 openpkg-src/perl/perl.patch
1.126 +1 -1 openpkg-src/perl/perl.spec
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.patch
$ cvs diff -u -r1.25 -r1.26 perl.patch
--- openpkg-src/perl/perl.patch 19 Dec 2007 13:17:30 - 1.25
+++ openpkg-src/perl/perl.patch 28 Mar 2008 14:28:21 - 1.26
@@ -4,8 +4,8 @@
area is.
Index: installperl
installperl.orig 2006-08-15 14:37:41 +0200
-+++ installperl 2006-08-18 21:05:05 +0200
+--- installperl.orig 2007-12-18 11:47:07 +0100
installperl 2008-03-28 15:23:47 +0100
@@ -211,6 +211,8 @@
my $installarchlib = "$destdir$Config{installarchlib}";
my $installsitelib = "$destdir$Config{installsitelib}";
@@ -15,7 +15,7 @@
my $installman1dir = "$destdir$Config{installman1dir}";
my $man1ext = $Config{man1ext};
my $libperl = $Config{libperl};
-@@ -403,6 +405,8 @@
+@@ -372,6 +374,8 @@
mkpath($installarchlib, $verbose, 0777);
mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
@@ -36,9 +36,9 @@
PERL[5]LIB, site, vendor, perl, other".
Index: perl.c
perl.c.orig 2006-08-15 14:37:41 +0200
-+++ perl.c 2006-08-18 21:08:14 +0200
-@@ -4749,39 +4749,6 @@
+--- perl.c.orig 2007-12-18 11:47:08 +0100
perl.c 2008-03-28 15:23:47 +0100
+@@ -4753,39 +4753,6 @@
incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
#endif
@@ -78,7 +78,7 @@
#ifdef SITEARCH_EXP
/* sitearch is always relative to sitelib on Windows for
* DLL-based path intuition to work correctly */
-@@ -4824,6 +4791,39 @@
+@@ -4828,6 +4795,39 @@
incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
#endif
@@ -135,8 +135,8 @@
related to the non-standard "__private_extern__" attribute.
Index: hints/darwin.sh
hints/darwin.sh.orig 2006-08-15 14:37:41 +0200
-+++ hints/darwin.sh 2006-08-18 21:05:05 +0200
+--- hints/darwin.sh.orig 2007-12-18 11:47:07 +0100
hints/darwin.sh 2008-03-28 15:23:47 +0100
@@ -120,9 +120,6 @@
*-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN"
;;
esac
@@ -158,9 +158,9 @@
cat > UU/archname.cbu <<'EOCBU'
# This script UU/archname.cbu will get 'called-back' by Configure
Index: perlio.c
perlio.c.orig2006-08-15 14:37:41 +0200
-+++ perlio.c 2006-08-18 21:05:05 +0200
-@@ -461,7 +461,14 @@
+--- perlio.c.orig2007-12-18 11:47:08 +0100
perlio.c 2008-03-28 15:23:47 +0100
+@@ -472,7 +472,14 @@
#include
#endif
#ifdef HAS_MMAP
@@ -176,8 +176,8 @@
void
Index: ext/DynaLoader/dl_dyld.xs
ext/DynaLoader/dl_dyld.xs.orig 2006-08-15 14:37:40 +0200
-+++ ext/DynaLoader/dl_dyld.xs2006-08-18 21:05:05 +0200
+--- ext/DynaLoader/dl_dyld.xs.orig 2007-12-18 11:47:07 +0100
ext/DynaLoader/dl_dyld.xs2008-03-28 15:23:47 +0100
@@ -45,7 +45,13 @@
#undef environ
@@ -205,7 +205,7 @@
Index: hints/dec_osf.sh
--- hints/dec_osf.sh.orig2007-12-18 11:47:07 +0100
-+++ hints/dec_osf.sh 2007-12-19 12:31:37 +0100
hints/dec_osf.sh 2008-03-28 15:23:47 +0100
@@ -73,15 +73,6 @@
*)if $test "X$optimize" = "X$undef"; then
lddlflags="$lddlflags -msym"
@@ -231,9 +231,9 @@
users to overwrite files via a symlink attack on temporary files.
Index: lib/CGI/Cookie.pm
lib/CGI/Cookie.pm.orig 2006-08-15 14:37:41 +0200
-+++ lib/CGI/Cookie.pm2006-08-18 21:05:05 +0200
-@@ -444,7 +444,7 @@
+--- lib/CGI/Cookie.pm.orig 2007-12-18 11:47:07 +0100
lib/CGI/Cookie.pm2008-03-28 15:23:47 +0100
+@@ -470,7 +470,7 @@
You may also retrieve cookies that were stored in some external
form using the parse() class method:
@@ -243,9 +243,9 @@
If you are in a mod_perl environment, you can save some overhead by
Index: lib/Shell.pm
lib/Shell.pm.orig2006-08-15 14:37:41 +0200
-+++ lib/Shell.pm 2006-08-18 21:05:05 +0200
-@@ -154,7 +154,7 @@
+--- lib/Shell.pm.orig200
[CVS] OpenPKG: openpkg-src/gdb/ gdb.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 08:51:32
Branch: HEAD Handle: 2008032807513200
Modified files:
openpkg-src/gdb gdb.spec
Log:
upgrading package: gdb 6.7.1 -> 6.8
Summary:
RevisionChanges Path
1.55+2 -2 openpkg-src/gdb/gdb.spec
patch -p0 <<'@@ .'
Index: openpkg-src/gdb/gdb.spec
$ cvs diff -u -r1.54 -r1.55 gdb.spec
--- openpkg-src/gdb/gdb.spec 1 Jan 2008 14:54:18 - 1.54
+++ openpkg-src/gdb/gdb.spec 28 Mar 2008 07:51:32 - 1.55
@@ -31,8 +31,8 @@
Class:BASE
Group:Debugging
License: GPL
-Version: 6.7.1
-Release: 20080101
+Version: 6.8
+Release: 20080328
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/fop/ fop.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 08:50:08
Branch: HEAD Handle: 2008032807500700
Modified files:
openpkg-src/fop fop.spec
Log:
fix URL
Summary:
RevisionChanges Path
1.27+3 -3 openpkg-src/fop/fop.spec
patch -p0 <<'@@ .'
Index: openpkg-src/fop/fop.spec
$ cvs diff -u -r1.26 -r1.27 fop.spec
--- openpkg-src/fop/fop.spec 1 Jan 2008 14:53:58 - 1.26
+++ openpkg-src/fop/fop.spec 28 Mar 2008 07:50:07 - 1.27
@@ -32,10 +32,10 @@
Group:Typesetting
License: GPL
Version: 0.94
-Release: 20080101
+Release: 20080328
# list of sources
-Source0:
http://www.apache.org/dist/xmlgraphics/fop/fop-%{version}-bin-jdk1.4.tar.gz
+Source0:
http://www.apache.org/dist/xmlgraphics/fop/binaries/fop-%{version}-bin-jdk1.4.tar.gz
Source1: fop.sh
# build information
@@ -58,7 +58,7 @@
%track
prog fop = {
version = %{version}
-url = http://www.apache.org/dist/xmlgraphics/fop/
+url = http://www.apache.org/dist/xmlgraphics/fop/binaries/
regex = fop-(\d+\.\d+(?:\.\d+)?)-bin(?:-jdk1.[456])?\.tar\.gz
}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/sudo/ sudo.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Mar-2008 08:49:19 Branch: HEAD Handle: 2008032807491600 Modified files: openpkg-src/sudosudo.spec Log: upgrading package: sudo 1.6.9p14 -> 1.6.9p15 Summary: RevisionChanges Path 1.114 +2 -2 openpkg-src/sudo/sudo.spec patch -p0 <<'@@ .' Index: openpkg-src/sudo/sudo.spec $ cvs diff -u -r1.113 -r1.114 sudo.spec --- openpkg-src/sudo/sudo.spec6 Mar 2008 07:21:30 - 1.113 +++ openpkg-src/sudo/sudo.spec28 Mar 2008 07:49:16 - 1.114 @@ -31,8 +31,8 @@ Class:BASE Group:ShellUtils License: BSD -Version: 1.6.9p14 -Release: 20080306 +Version: 1.6.9p15 +Release: 20080328 # package options %option with_fslyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/smokeping/ smokeping.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 08:48:27
Branch: HEAD Handle: 2008032807482700
Modified files:
openpkg-src/smokeping smokeping.spec
Log:
upgrading package: smokeping 2.3.3 -> 2.3.4
Summary:
RevisionChanges Path
1.43+2 -2 openpkg-src/smokeping/smokeping.spec
patch -p0 <<'@@ .'
Index: openpkg-src/smokeping/smokeping.spec
$ cvs diff -u -r1.42 -r1.43 smokeping.spec
--- openpkg-src/smokeping/smokeping.spec 10 Mar 2008 16:04:31 -
1.42
+++ openpkg-src/smokeping/smokeping.spec 28 Mar 2008 07:48:27 -
1.43
@@ -31,8 +31,8 @@
Class:PLUS
Group:Mapping
License: GPL
-Version: 2.3.3
-Release: 20080310
+Version: 2.3.4
+Release: 20080328
# list of sources
Source0: http://oss.oetiker.ch/smokeping/pub/smokeping-%{version}.tar.gz
@@ .
__
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: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2008 08:47:07
Branch: HEAD Handle: 2008032807470500
Modified files:
openpkg-src/monotonemonotone.patch monotone.spec
Log:
apply an upstream bugfix
Summary:
RevisionChanges Path
1.14+48 -0 openpkg-src/monotone/monotone.patch
1.32+1 -1 openpkg-src/monotone/monotone.spec
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch
$ cvs diff -u -r1.13 -r1.14 monotone.patch
--- openpkg-src/monotone/monotone.patch 7 Mar 2008 12:41:36 -
1.13
+++ openpkg-src/monotone/monotone.patch 28 Mar 2008 07:47:05 -
1.14
@@ -25,6 +25,8 @@
special cases related to the missing trailing newline. The complete
Monotone test suite still succeeed with 0 failures after this change.
+Can be removed with Monotone >= 0.40!
+
Index: diff_patch.cc
--- diff_patch.cce359a4c03c6ce548d6414dce11160fbcb6fcb831
+++ diff_patch.ccdaeb9be7d8c10d33781b54debd541027618dbfce
@@ -130,3 +132,49 @@
std::string & out,
std::string const & linesep);
+-
+
+Fix merging in a special case.
+Can be removed with Monotone >= 0.40!
+
+--- roster_merge.cc d565f9299ca85d77bd1d7f2a29196d7161f0ea08
roster_merge.cc d113e5d648bd98bdc15ba7a53958496ea924bd2b
+@@ -525,15 +525,35 @@ roster_merge_result::report_duplicate_na
+ left_roster.get_name(left_nid, left_name);
+ right_roster.get_name(right_nid, right_name);
+
+- I(left_name == right_name);
+-
+ shared_ptr left_lca_roster, right_lca_roster;
+ revision_id left_lca_rid, right_lca_rid;
+
+ adaptor.get_ancestral_roster(left_nid, left_lca_rid, left_lca_roster);
+ adaptor.get_ancestral_roster(right_nid, right_lca_rid,
right_lca_roster);
+
+- P(F("conflict: duplicate name '%s'") % left_name);
++ // In most cases, the left_name equals the right_name. However, maybe
++ // a parent directory got renamed on one side. In that case, the names
++ // don't match, but it's still the same directory (by node id), to
++ // which we want to add the same file (by name).
++ if (left_name == right_name)
++{
++ file_path dir;
++ path_component basename;
++ left_name.dirname_basename(dir, basename);
++ P(F("conflict: duplicate name '%s' for the directory '%s'") %
basename % dir);
++}
++ else
++{
++ file_path left_dir, right_dir;
++ path_component left_basename, right_basename;
++ left_name.dirname_basename(left_dir, left_basename);
++ right_name.dirname_basename(right_dir, right_basename);
++ I(left_basename == right_basename);
++ P(F("conflict: duplicate name '%s' for the directory\n"
++ " named '%s' on the left and\n"
++ " named '%s' on the right.")
++% left_basename % left_dir % right_dir);
++}
+
+ node_type left_type = get_type(left_roster, left_nid);
+ node_type right_type = get_type(right_roster, right_nid);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
$ cvs diff -u -r1.31 -r1.32 monotone.spec
--- openpkg-src/monotone/monotone.spec7 Mar 2008 12:41:36 -
1.31
+++ openpkg-src/monotone/monotone.spec 28 Mar 2008 07:47:05 -
1.32
@@ -32,7 +32,7 @@
Group:SCM
License: GPL
Version: 0.39
-Release: 20080307
+Release: 20080328
# package options
%option with_rse yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
