[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 20:26:23 Branch: HEAD Handle: 2008052319262300 Modified files: openpkg-src/drupal drupal.patch Log: get rid of the declaration in the snippet output Summary: RevisionChanges Path 1.15+21 -7 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.14 -r1.15 drupal.patch --- openpkg-src/drupal/drupal.patch 23 May 2008 16:58:41 - 1.14 +++ openpkg-src/drupal/drupal.patch 23 May 2008 18:26:23 - 1.15 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.14 2008/05/23 16:58:41 rse Exp $ */ ++/* $Id: drupal.patch,v 1.15 2008/05/23 18:26:23 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -572,15 +572,16 @@ - -Fix content validation in "xmlcontent" module in case -one has enabled multiple filters on a particular input format. +1. Fix content validation in "xmlcontent" module in case + one has enabled multiple filters on a particular input format. +2. Additionally, allow absolute paths to support .xsd/.xsl files + in arbitrary directories. +3. Finally, do not create a new DOM and output it as XML. Instead directly + output the transformed XML in order to get rid of the declaration. -Additionally, allow absolute paths to support .xsd/.xsl files -in arbitrary directories. - Index: sites/all/modules/xmlcontent/xmlcontent.module --- sites/all/modules/xmlcontent/xmlcontent.module.orig 2007-03-14 22:59:59 +0100 -+++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 18:56:10 +0200 sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 20:23:31 +0200 @@ -39,7 +39,9 @@ return t('Allows users to post XML node content and get it transformed through a configured XSLT script'); @@ -613,3 +614,16 @@ if (!is_file($schema_path) && ($validation == 'xsd' or $validation == 'rng')) { $schema_path = null; watchdog( 'xmlcontent', t('Validation required but no schema file'), WATCHDOG_WARNING ); +@@ -242,10 +247,8 @@ + } + + // Transform +- $newdom = $proc->transformToDoc($dom); +- +- // Return the output as XML text (in fact subset of XHTML, depending on the XSLT script) +- return $newdom->saveXML(); ++ $xml = $proc->transformToXML($dom); ++ return $xml; + } + + @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 18:58:42 Branch: HEAD Handle: 2008052317584100 Modified files: openpkg-src/drupal drupal.patch Log: allow .xsd/.xsl files under arbitrary paths Summary: RevisionChanges Path 1.14+29 -4 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.13 -r1.14 drupal.patch --- openpkg-src/drupal/drupal.patch 23 May 2008 16:28:33 - 1.13 +++ openpkg-src/drupal/drupal.patch 23 May 2008 16:58:41 - 1.14 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.13 2008/05/23 16:28:33 rse Exp $ */ ++/* $Id: drupal.patch,v 1.14 2008/05/23 16:58:41 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -574,11 +574,25 @@ Fix content validation in "xmlcontent" module in case one has enabled multiple filters on a particular input format. + +Additionally, allow absolute paths to support .xsd/.xsl files +in arbitrary directories. Index: sites/all/modules/xmlcontent/xmlcontent.module --- sites/all/modules/xmlcontent/xmlcontent.module.orig 2007-03-14 22:59:59 +0100 -+++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 18:22:29 +0200 -@@ -72,7 +72,7 @@ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 18:56:10 +0200 +@@ -39,7 +39,9 @@ + return t('Allows users to post XML node content and get it transformed through a configured XSLT script'); + + case 'process': +- $xslt_path = drupal_get_path('module', 'xmlcontent'). '/' . variable_get("xmlcontent_xslt_path_$format", ''); ++ $xslt_path = variable_get("xmlcontent_xslt_path_$format", ''); ++ if (substr($xslt_path, 0, 1) != "/") ++ $xslt_path = drupal_get_path('module', 'xmlcontent') . '/' . $xslt_path; + return _xmlcontent_transform($text, $xslt_path); + + case 'settings': +@@ -72,7 +74,7 @@ } // Does the input format of this node use XML Content filter? $format = filter_resolve_format($node->format); @@ -587,4 +601,15 @@ if ($module != 'xmlcontent') { return; } - +@@ -83,7 +85,10 @@ + return; + } + +- $schema_path = drupal_get_path('module', 'xmlcontent'). '/' . variable_get("xmlcontent_schema_path_$format",''); ++ $schema_path = variable_get("xmlcontent_schema_path_$format", ''); ++ if (substr($schema_path, 0, 1) != "/") ++ $schema_path = drupal_get_path('module', 'xmlcontent') . '/' . $schema_path; ++ + if (!is_file($schema_path) && ($validation == 'xsd' or $validation == 'rng')) { + $schema_path = null; + watchdog( 'xmlcontent', t('Validation required but no schema file'), WATCHDOG_WARNING ); @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 18:28:33 Branch: HEAD Handle: 2008052317283300 Modified files: openpkg-src/drupal drupal.patch Log: Arglll... is it me, is it really me? Every piece of code I want to _USE_ I first have to _FIX_. This time the developer of the 'xmlcontent' module has never tested its module in case one has multiple filters enabled for a particular input type Summary: RevisionChanges Path 1.13+20 -1 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.12 -r1.13 drupal.patch --- openpkg-src/drupal/drupal.patch 23 May 2008 15:11:55 - 1.12 +++ openpkg-src/drupal/drupal.patch 23 May 2008 16:28:33 - 1.13 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.12 2008/05/23 15:11:55 rse Exp $ */ ++/* $Id: drupal.patch,v 1.13 2008/05/23 16:28:33 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -569,3 +569,22 @@ drupal_set_message(t('The access rule has been deleted.')); $form_state['redirect'] = 'admin/user/rules'; return; + +- + +Fix content validation in "xmlcontent" module in case +one has enabled multiple filters on a particular input format. + +Index: sites/all/modules/xmlcontent/xmlcontent.module +--- sites/all/modules/xmlcontent/xmlcontent.module.orig 2007-03-14 22:59:59 +0100 sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 18:22:29 +0200 +@@ -72,7 +72,7 @@ + } + // Does the input format of this node use XML Content filter? + $format = filter_resolve_format($node->format); +- $module = db_result(db_query('SELECT module FROM {filters} WHERE format = %d', $format)); ++ $module = db_result(db_query("SELECT module FROM {filters} WHERE format = %d AND module = 'xmlcontent'", $format)); + if ($module != 'xmlcontent') { + return; + } + @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/star/ star.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: 23-May-2008 18:12:46 Branch: HEAD Handle: 2008052317124600 Modified files: openpkg-src/starstar.spec Log: upgrading package: star 1.5 -> 1.5a89 Summary: RevisionChanges Path 1.64+8 -4 openpkg-src/star/star.spec patch -p0 <<'@@ .' Index: openpkg-src/star/star.spec $ cvs diff -u -r1.63 -r1.64 star.spec --- openpkg-src/star/star.spec14 Apr 2008 18:17:10 - 1.63 +++ openpkg-src/star/star.spec23 May 2008 16:12:46 - 1.64 @@ -21,6 +21,10 @@ ## SUCH DAMAGE. ## +# package version +%define V_star1.5 +%define V_alpha a89 + # package information Name: star Summary: Fast Tape Archiver (TAR) @@ -31,11 +35,11 @@ Class:EVAL Group:Archiver License: CDDL -Version: 1.5 -Release: 20080414 +Version: %{V_star}%{V_alpha} +Release: 20080523 # list of sources -Source0: ftp://ftp.berlios.de/pub/star/star-%{version}.tar.bz2 +Source0: ftp://ftp.berlios.de/pub/star/alpha/star-%{version}.tar.bz2 Patch0: star.patch # build information @@ -67,7 +71,7 @@ } %prep -%setup -q +%setup -q -n star-%{V_star} %patch -p0 %build @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/heimdal/ heimdal.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: 23-May-2008 18:05:43 Branch: HEAD Handle: 2008052317054200 Modified files: openpkg-src/heimdal heimdal.spec Log: upgrading package: heimdal 1.1 -> 1.2 Summary: RevisionChanges Path 1.21+2 -2 openpkg-src/heimdal/heimdal.spec patch -p0 <<'@@ .' Index: openpkg-src/heimdal/heimdal.spec $ cvs diff -u -r1.20 -r1.21 heimdal.spec --- openpkg-src/heimdal/heimdal.spec 15 May 2008 15:32:36 - 1.20 +++ openpkg-src/heimdal/heimdal.spec 23 May 2008 16:05:42 - 1.21 @@ -31,8 +31,8 @@ Class:EVAL Group:Cryptography License: BSD -Version: 1.1 -Release: 20080515 +Version: 1.2 +Release: 20080523 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-mail/ perl-mail.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: 23-May-2008 18:04:47 Branch: HEAD Handle: 2008052317044600 Modified files: openpkg-src/perl-mail perl-mail.spec Log: modifying package: perl-mail-5.10.0 20080428 -> 20080523 Summary: RevisionChanges Path 1.291 +2 -2 openpkg-src/perl-mail/perl-mail.spec patch -p0 <<'@@ .' Index: openpkg-src/perl-mail/perl-mail.spec $ cvs diff -u -r1.290 -r1.291 perl-mail.spec --- openpkg-src/perl-mail/perl-mail.spec 28 Apr 2008 16:17:22 - 1.290 +++ openpkg-src/perl-mail/perl-mail.spec 23 May 2008 16:04:46 - 1.291 @@ -34,7 +34,7 @@ %define V_mime_explode0.38 %define V_mime_lite 3.021 %define V_mime_tools 5.426 -%define V_mime_types 1.23 +%define V_mime_types 1.24 %define V_user_identity 0.92 %define V_email_address 1.889 %define V_email_valid 0.179 @@ -57,7 +57,7 @@ Group:Perl License: GPL/Artistic Version: %{V_perl} -Release: 20080428 +Release: 20080523 # list of sources Source0: http://www.cpan.org/modules/by-module/Mail/MailTools-%{V_mailtools}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 17:11:57 Branch: HEAD Handle: 2008052316115500 Modified files: openpkg-src/drupal drupal.patch Log: fix quotes Summary: RevisionChanges Path 1.12+2 -2 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.11 -r1.12 drupal.patch --- openpkg-src/drupal/drupal.patch 23 May 2008 09:27:18 - 1.11 +++ openpkg-src/drupal/drupal.patch 23 May 2008 15:11:55 - 1.12 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.11 2008/05/23 09:27:18 rse Exp $ */ ++/* $Id: drupal.patch,v 1.12 2008/05/23 15:11:55 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -547,7 +547,7 @@ } else { -$edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid)); -+$edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = '%s'', $aid)); ++$edit = db_fetch_array(db_query("SELECT aid, type, status, mask FROM {access} WHERE aid = '%s'", $aid)); } return drupal_get_form('user_admin_access_edit_form', $edit, t('Save rule')); } @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libxslt/ libxslt.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: 23-May-2008 16:23:57 Branch: HEAD Handle: 2008052315235600 Modified files: openpkg-src/libxslt libxslt.spec Log: cleanup packaging Summary: RevisionChanges Path 1.99+2 -4 openpkg-src/libxslt/libxslt.spec patch -p0 <<'@@ .' Index: openpkg-src/libxslt/libxslt.spec $ cvs diff -u -r1.98 -r1.99 libxslt.spec --- openpkg-src/libxslt/libxslt.spec 14 May 2008 12:19:50 - 1.98 +++ openpkg-src/libxslt/libxslt.spec 23 May 2008 14:23:56 - 1.99 @@ -32,7 +32,7 @@ Group:XML License: MIT-style Version: 1.1.24 -Release: 20080514 +Release: 20080523 # list of sources Source0: ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz @@ -64,9 +64,6 @@ %{l_shtool} subst \ -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \ configure -%{l_shtool} subst \ --e 's;^\($(mkinstalldirs) "\)\($(libdir).*\)$;\1$(DESTDIR)\2;' \ -libxslt/Makefile.{am,in} %build CC="%{l_cc}" \ @@ -76,6 +73,7 @@ LIBS="-lz -liconv" \ ./configure \ --prefix=%{l_prefix} \ +--mandir=%{l_prefix}/man \ --with-libxml-prefix=%{l_prefix} \ --without-crypto \ --without-debug \ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/file/ file.patch file.spec
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef HAVE_ASPRINTF ++int asprintf(char **str, const char *fmt, ...) ++{ ++ va_list ap; ++ int ret; ++ ++ *str = NULL; ++ va_start(ap, fmt); ++ ret = vasprintf(str, fmt, ap); ++ va_end(ap); ++ ++ return ret; ++} ++#endif ++ ++#ifndef HAVE_VASPRINTF ++ ++#ifdef HAVE_LIMITS_H ++#include ++#endif ++ ++#include ++#include ++#include ++ ++#ifndef VA_COPY ++# ifdef HAVE_VA_COPY ++# define VA_COPY(dest, src) va_copy(dest, src) ++# else ++# ifdef HAVE___VA_COPY ++# define VA_COPY(dest, src) __va_copy(dest, src) ++# else ++# define VA_COPY(dest, src) (dest) = (src) ++# endif ++# endif ++#endif ++ ++#define INIT_SZ 128 ++ ++int vasprintf(char **str, const char *fmt, va_list ap) ++{ ++ int ret = -1; ++ va_list ap2; ++ char *string, *newstr; ++ size_t len; ++ ++ VA_COPY(ap2, ap); ++ if ((string = malloc(INIT_SZ)) == NULL) ++ goto fail; ++ ++ ret = vsnprintf(string, INIT_SZ, fmt, ap2); ++ if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */ ++ *str = string; ++ } else if (ret == INT_MAX || ret < 0) { /* Bad length */ ++ free(string); ++ goto fail; ++ } else {/* bigger than initial, realloc allowing for nul */ ++ len = (size_t)ret + 1; ++ if ((newstr = realloc(string, len)) == NULL) { ++ free(string); ++ goto fail; ++ } else { ++ va_end(ap2); ++ VA_COPY(ap2, ap); ++ ret = vsnprintf(newstr, len, fmt, ap2); ++ if (ret >= 0 && (size_t)ret < len) { ++ *str = newstr; ++ } else { /* failed with realloc'ed string, give up */ ++ free(newstr); ++ goto fail; ++ } ++ } ++ } ++ va_end(ap2); ++ return (ret); ++ ++fail: ++ *str = NULL; ++ errno = ENOMEM; ++ va_end(ap2); ++ return (-1); ++} ++#endif ++ +Index: src/getopt_long.c +--- src/getopt_long.c.orig 2008-02-07 01:50:10 +0100 src/getopt_long.c2008-05-23 13:35:47 +0200 +@@ -30,9 +30,7 @@ + */ + + #include +-#include + #include +-#include + #include + #include + +@@ -73,6 +71,16 @@ + + #define EMSG"" - #ifndef COMPILE_ONLY ++#define __P(x) x ++#define warnx file_warnx ++void warnx(const char *fmt, ...) ++{ ++va_list ap; ++va_start(ap, fmt); ++vfprintf(stderr, "WARNING: %s\n", ap); ++va_end(ap); ++} ++ + static int getopt_internal __P((int, char **, const char *)); + static int gcd __P((int, int)); + static void permute_args __P((int, int, int, char **)); Index: src/magic.c src/magic.c.orig 2007-12-27 17:35:59 +0100 -+++ src/magic.c 2008-03-31 20:50:08 +0200 -@@ -322,7 +322,7 @@ +--- src/magic.c.orig 2008-02-19 16:16:38 +0100 src/magic.c 2008-05-23 13:35:47 +0200 +@@ -325,7 +325,7 @@ if (ispipe) { ssize_t r = 0; @@ -64,9 +251,9 @@ nbytes += r; if (r < PIPE_BUF) break; Index: src/softmagic.c src/softmagic.c.orig 2007-12-27 17:35:59 +0100 -+++ src/softmagic.c 2008-03-31 20:50:08 +0200 -@@ -288,10 +288,9 @@ +--- src/softmagic.c.orig 2008-03-07 16:00:07 +0100 src/softmagic.c 2008-05-23 13:35:47 +0200 +@@ -302,10 +302,9 @@ } #ifndef HAVE_STRNDUP @@ . patch -p0 <<'@@ .' Index: openpkg-src/file/file.spec $ cvs diff -u -r1.78 -r1.79 file.spec --- openpkg-src/file/file.spec19 May 2008 05:27:24 - 1.78 +++ openpkg-src/file/file.spec23 May 2008 11:40:28 - 1.79 @@ -36,7 +36,7 @@ Group:Filesystem License: BSD Version: %{V_api_c} -Release: 20080519 +Release: 20080523 # package options %option with_perl no @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/jabberd/ jabberd.patch jabberd.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: 23-May-2008 13:01:36 Branch: HEAD Handle: 2008052312013500 Modified files: openpkg-src/jabberd jabberd.patch jabberd.spec Log: upgrading package: jabberd 2.1.24.1 -> 2.2.0 Summary: RevisionChanges Path 1.16+19 -44 openpkg-src/jabberd/jabberd.patch 1.71+5 -8 openpkg-src/jabberd/jabberd.spec patch -p0 <<'@@ .' Index: openpkg-src/jabberd/jabberd.patch $ cvs diff -u -r1.15 -r1.16 jabberd.patch --- openpkg-src/jabberd/jabberd.patch 22 Jan 2008 16:06:32 - 1.15 +++ openpkg-src/jabberd/jabberd.patch 23 May 2008 11:01:35 - 1.16 @@ -1,6 +1,6 @@ Index: etc/c2s.xml.dist.in etc/c2s.xml.dist.in.orig 2008-01-21 16:17:03 +0100 -+++ etc/c2s.xml.dist.in 2008-01-22 16:57:57 +0100 +--- etc/c2s.xml.dist.in.orig 2008-05-22 17:36:32 +0200 etc/c2s.xml.dist.in 2008-05-23 08:29:23 +0200 @@ -50,18 +50,16 @@ @@ -23,7 +23,7 @@ -@@ -128,7 +126,7 @@ +@@ -130,7 +128,7 @@ --> @@ -32,7 +32,7 @@ -@@ -292,7 +290,7 @@ +@@ -294,7 +292,7 @@ @pkglibdir@ @@ -41,34 +41,9 @@ -Index: etc/resolver.xml.dist.in etc/resolver.xml.dist.in.orig2008-01-21 16:17:03 +0100 -+++ etc/resolver.xml.dist.in 2008-01-22 16:57:57 +0100 -@@ -50,18 +50,16 @@ - - - -- -+ - --jabberd/resolver -+ - - --local3 -+ - - -- - - - 5347 Index: etc/s2s.xml.dist.in etc/s2s.xml.dist.in.orig 2008-01-21 16:17:03 +0100 -+++ etc/s2s.xml.dist.in 2008-01-22 16:57:57 +0100 +--- etc/s2s.xml.dist.in.orig 2008-05-22 17:36:32 +0200 etc/s2s.xml.dist.in 2008-05-23 08:29:23 +0200 @@ -60,25 +60,23 @@ @@ -130,11 +105,11 @@ +127.0.0.1 5269 - @@ -151,7 +126,7 @@ @@ -161,8 +136,8 @@ Index: sm/mod_iq_time.c sm/mod_iq_time.c.orig2008-01-21 16:16:56 +0100 -+++ sm/mod_iq_time.c 2008-01-22 16:57:57 +0100 +--- sm/mod_iq_time.c.orig2008-05-22 17:36:28 +0200 sm/mod_iq_time.c 2008-05-23 08:29:23 +0200 @@ -39,6 +39,7 @@ static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt) { @@ -182,8 +157,8 @@ snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60)); #endif Index: sm/mod_roster.c sm/mod_roster.c.orig 2008-01-21 16:16:56 +0100 -+++ sm/mod_roster.c 2008-01-22 16:57:57 +0100 +--- sm/mod_roster.c.orig 2008-05-22 17:36:28 +0200 sm/mod_roster.c 2008-05-23 08:29:23 +0200 @@ -639,6 +639,9 @@ if(user->sessions == NULL) return mod_PASS; @@ -195,8 +170,8 @@ pkt = pkt_create(user->sm, "iq", "set", NULL, NULL); pkt_id_new(pkt); Index: util/util.h util/util.h.orig 2008-01-21 16:17:04 +0100 -+++ util/util.h 2008-01-22 16:57:57 +0100 +--- util/util.h.orig 2008-05-22 17:36:32 +0200 util/util.h 2008-05-23 08:29:23 +0200 @@ -30,6 +30,8 @@ #include #include @@ . patch -p0 <<'@@ .' Index: openpkg-src/jabberd/jabberd.spec $ cvs diff -u -r1.70 -r1.71 jabberd.spec --- openpkg-src/jabberd/jabberd.spec 27 Apr 2008 18:54:21 - 1.70 +++ openpkg-src/jabberd/jabberd.spec 23 May 2008 11:01:35 - 1.71 @@ -22,8 +22,8 @@ ## # package version -%define V_major 2.1 -%define V_minor 24.1 +%define V_major 2.2 +%define V_minor 0 # package information Name: jabberd @@ -36,7 +36,7 @@ Group:InstantMessaging License: JOSL/GPL Version: %{V_major}.%{V_minor} -Release: 20080427 +Release: 20080523 # package options %option with_sqlite no @@ -54,8 +54,8 @@ BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, make PreReq: OpenPKG, openpkg >= 20060823, perl -BuildPreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl -PreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl +BuildPreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl, udns +PreReq:
[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 11:27:19 Branch: HEAD Handle: 2008052310271800 Modified files: openpkg-src/drupal drupal.patch Log: hmmm Drupal uses the 'aid' field of the 'actions' table incorrectly at a lot more code locations. Fix all of them, too Summary: RevisionChanges Path 1.11+95 -2 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.10 -r1.11 drupal.patch --- openpkg-src/drupal/drupal.patch 23 May 2008 08:44:10 - 1.10 +++ openpkg-src/drupal/drupal.patch 23 May 2008 09:27:18 - 1.11 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.10 2008/05/23 08:44:10 rse Exp $ */ ++/* $Id: drupal.patch,v 1.11 2008/05/23 09:27:18 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -461,7 +461,7 @@ - -Fix "Action" administration dialog. +Fix "Action" related administration dialog and corresponding run-time handling. Index: modules/system/system.module --- modules/system/system.module.orig2008-04-09 23:11:49 +0200 @@ -476,3 +476,96 @@ $edit['actions_type'] = $data->type; $function = $data->callback; +Index: includes/actions.inc +--- includes/actions.inc.orig2007-12-31 15:51:04 +0100 includes/actions.inc 2008-05-23 11:22:17 +0200 +@@ -54,7 +54,7 @@ + $where_values = array(); + foreach ($action_ids as $action_id) { + if (is_numeric($action_id)) { +-$where[] = 'OR aid = %d'; ++$where[] = "OR aid = '%s'"; + $where_values[] = $action_id; + } + elseif (isset($available_actions[$action_id])) { +@@ -93,7 +93,7 @@ + else { + // If it's a configurable action, retrieve stored parameters. + if (is_numeric($action_ids)) { +- $action = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", $action_ids)); ++ $action = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $action_ids)); + $function = $action->callback; + $context = array_merge($context, unserialize($action->parameters)); + $result[$action_ids] = $function($object, $context, $a1, $a2); +@@ -325,7 +325,7 @@ + function actions_save($function, $type, $params, $desc, $aid = NULL) { + $serialized = serialize($params); + if ($aid) { +-db_query("UPDATE {actions} SET callback = '%s', type = '%s', parameters = '%s', description = '%s' WHERE aid = %d", $function, $type, $serialized, $desc, $aid); ++db_query("UPDATE {actions} SET callback = '%s', type = '%s', parameters = '%s', description = '%s' WHERE aid = '%s'", $function, $type, $serialized, $desc, $aid); + watchdog('actions', 'Action %action saved.', array('%action' => $desc)); + } + else { +@@ -333,7 +333,7 @@ + // separate table for numeric aids. + db_query('INSERT INTO {actions_aid} VALUES (default)'); + $aid = db_last_insert_id('actions_aid', 'aid'); +-db_query("INSERT INTO {actions} (aid, callback, type, parameters, description) VALUES (%d, '%s', '%s', '%s', '%s')", $aid, $function, $type, $serialized, $desc); ++db_query("INSERT INTO {actions} (aid, callback, type, parameters, description) VALUES ('%s', '%s', '%s', '%s', '%s')", $aid, $function, $type, $serialized, $desc); + watchdog('actions', 'Action %action created.', array('%action' => $desc)); + } + +@@ -350,7 +350,7 @@ + * The appropriate action row from the database as an object. + */ + function actions_load($aid) { +- return db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", $aid)); ++ return db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid)); + } + + /** +@@ -360,6 +360,6 @@ + * integer The ID of the action to delete. + */ + function actions_delete($aid) { +- db_query("DELETE FROM {actions} WHERE aid = %d", $aid); ++ db_query("DELETE FROM {actions} WHERE aid = '%s'", $aid); + module_invoke_all('actions_delete', $aid); + } +Index: modules/user/user.admin.inc +--- modules/user/user.admin.inc.orig 2008-01-16 23:54:41 +0100 modules/user/user.admin.inc
[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: 23-May-2008 11:14:47 Branch: HEAD Handle: 2008052310144700 Modified files: openpkg-src/drupal drupal.spec Log: update a module Summary: RevisionChanges Path 1.252 +1 -1 openpkg-src/drupal/drupal.spec patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.spec $ cvs diff -u -r1.251 -r1.252 drupal.spec --- openpkg-src/drupal/drupal.spec23 May 2008 06:29:38 - 1.251 +++ openpkg-src/drupal/drupal.spec23 May 2008 09:14:47 - 1.252 @@ -155,7 +155,7 @@ %define V_module_taxonomy_browser6.x-1.1 %define V_module_taxonomy_delegate 6.x-1.2 %define V_module_taxonomy_manager6.x-1.x-dev -%define V_module_taxonomy_vtn6.x-1.0-rc2 +%define V_module_taxonomy_vtn6.x-1.0-rc3 %define V_module_teleport6.x-1.0 %define V_module_textsize6.x-1.x-dev %define V_module_texy6.x-1.0-beta1 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal-apache.conf
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: 23-May-2008 11:09:32 Branch: HEAD Handle: 2008052310093200 Modified files: openpkg-src/drupal drupal-apache.conf Log: if setting PHP ini error_reporting value from within Apache one has to use the effective numerical value or Drupal will not log anything at all Summary: RevisionChanges Path 1.12+1 -1 openpkg-src/drupal/drupal-apache.conf patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal-apache.conf $ cvs diff -u -r1.11 -r1.12 drupal-apache.conf --- openpkg-src/drupal/drupal-apache.conf 10 Apr 2008 10:28:05 - 1.11 +++ openpkg-src/drupal/drupal-apache.conf 23 May 2008 09:09:32 - 1.12 @@ -82,7 +82,7 @@ php_admin_flagsession.auto_startoff php_admin_value session.save_handler user php_admin_value session.cache_limiter none -php_admin_value error_reporting E_ALL&~E_NOTICE +php_admin_value error_reporting 6135 php_admin_value memory_limit 64M php_admin_value mbstring.http_input pass php_admin_value mbstring.http_output pass @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch
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: 23-May-2008 10:44:10 Branch: HEAD Handle: 2008052309441000 Modified files: openpkg-src/drupal drupal.patch Log: Fix Action administration dialog Summary: RevisionChanges Path 1.10+18 -1 openpkg-src/drupal/drupal.patch patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch $ cvs diff -u -r1.9 -r1.10 drupal.patch --- openpkg-src/drupal/drupal.patch 16 May 2008 18:12:17 - 1.9 +++ openpkg-src/drupal/drupal.patch 23 May 2008 08:44:10 - 1.10 @@ -330,7 +330,7 @@ --- /dev/null2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.9 2008/05/16 18:12:17 rse Exp $ */ ++/* $Id: drupal.patch,v 1.10 2008/05/23 08:44:10 rse Exp $ */ + +function launch_popup(nid, mw, mh) { +var ox = mw; @@ -459,3 +459,20 @@ '#required' => ($word_count > 0), ); +- + +Fix "Action" administration dialog. + +Index: modules/system/system.module +--- modules/system/system.module.orig2008-04-09 23:11:49 +0200 modules/system/system.module 2008-05-23 10:41:26 +0200 +@@ -1431,7 +1439,7 @@ + if (is_numeric($action)) { + $aid = $action; + // Load stored parameter values from database. +-$data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", intval($aid))); ++$data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid)); + $edit['actions_description'] = $data->description; + $edit['actions_type'] = $data->type; + $function = $data->callback; + @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/opendbx/ opendbx.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: 23-May-2008 10:41:28 Branch: HEAD Handle: 2008052309412700 Modified files: openpkg-src/opendbx opendbx.spec Log: upgrading package: opendbx 1.3.8 -> 1.3.9 Summary: RevisionChanges Path 1.19+2 -2 openpkg-src/opendbx/opendbx.spec patch -p0 <<'@@ .' Index: openpkg-src/opendbx/opendbx.spec $ cvs diff -u -r1.18 -r1.19 opendbx.spec --- openpkg-src/opendbx/opendbx.spec 3 May 2008 08:14:24 - 1.18 +++ openpkg-src/opendbx/opendbx.spec 23 May 2008 08:41:27 - 1.19 @@ -31,8 +31,8 @@ Class:EVAL Group:Database License: LGPL -Version: 1.3.8 -Release: 20080503 +Version: 1.3.9 +Release: 20080523 # package options %option with_sqlite yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-par/ perl-par.patch perl-par.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: 23-May-2008 10:41:27 Branch: HEAD Handle: 2008052309412600 Modified files: openpkg-src/perl-parperl-par.patch perl-par.spec Log: modifying package: perl-par-5.10.0 20080514 -> 20080523 Summary: RevisionChanges Path 1.6 +3 -3 openpkg-src/perl-par/perl-par.patch 1.43+2 -2 openpkg-src/perl-par/perl-par.spec patch -p0 <<'@@ .' Index: openpkg-src/perl-par/perl-par.patch $ cvs diff -u -r1.5 -r1.6 perl-par.patch --- openpkg-src/perl-par/perl-par.patch 14 May 2008 12:20:17 - 1.5 +++ openpkg-src/perl-par/perl-par.patch 23 May 2008 08:41:26 - 1.6 @@ -1,6 +1,6 @@ -Index: PAR-0.979/Makefile.PL PAR-0.979/Makefile.PL2007-07-29 13:05:39 +0200 -+++ PAR-0.979/Makefile.PL2007-10-04 19:24:08 +0200 +Index: PAR-0.980/Makefile.PL +--- PAR-0.980/Makefile.PL2007-07-29 13:05:39 +0200 PAR-0.980/Makefile.PL2007-10-04 19:24:08 +0200 @@ -12,21 +12,6 @@ requires'PAR::Dist' => 0.22; requires'AutoLoader'=> 5.63; @@ . patch -p0 <<'@@ .' Index: openpkg-src/perl-par/perl-par.spec $ cvs diff -u -r1.42 -r1.43 perl-par.spec --- openpkg-src/perl-par/perl-par.spec14 May 2008 12:20:17 - 1.42 +++ openpkg-src/perl-par/perl-par.spec23 May 2008 08:41:26 - 1.43 @@ -24,7 +24,7 @@ # versions of individual parts %define V_perl 5.10.0 %define V_par_dist 0.29 -%define V_par 0.979 +%define V_par 0.980 # package information Name: perl-par @@ -37,7 +37,7 @@ Group:Perl License: GPL/Artistic Version: %{V_perl} -Release: 20080514 +Release: 20080523 # list of sources Source0: http://www.cpan.org/modules/by-module/PAR/PAR-Dist-%{V_par_dist}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ctalk/ ctalk.patch ctalk.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: 23-May-2008 10:41:26 Branch: HEAD Handle: 2008052309412600 Modified files: openpkg-src/ctalk ctalk.patch ctalk.spec Log: modifying package: ctalk-0.0.52a 20080519 -> 20080523 Summary: RevisionChanges Path 1.59+15 -15 openpkg-src/ctalk/ctalk.patch 1.61+2 -2 openpkg-src/ctalk/ctalk.spec patch -p0 <<'@@ .' Index: openpkg-src/ctalk/ctalk.patch $ cvs diff -u -r1.58 -r1.59 ctalk.patch --- openpkg-src/ctalk/ctalk.patch 19 May 2008 15:53:02 - 1.58 +++ openpkg-src/ctalk/ctalk.patch 23 May 2008 08:41:26 - 1.59 @@ -110,9 +110,9 @@ LIBTOOL = @LIBTOOL@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ -Index: ctpp-1.0.32/ctpp/Makefile.in ctpp-1.0.32/ctpp/Makefile.in.orig2008-04-27 06:26:34 +0200 -+++ ctpp-1.0.32/ctpp/Makefile.in 2008-04-28 08:14:42 +0200 +Index: ctpp-1.0.33/ctpp/Makefile.in +--- ctpp-1.0.33/ctpp/Makefile.in.orig2008-04-27 06:26:34 +0200 ctpp-1.0.33/ctpp/Makefile.in 2008-04-28 08:14:42 +0200 @@ -120,7 +120,7 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -122,9 +122,9 @@ LIBTOOL = @LIBTOOL@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ -Index: ctpp-1.0.32/ctpp/builtins.c ctpp-1.0.32/ctpp/builtins.c.orig 2008-03-25 21:32:00 +0100 -+++ ctpp-1.0.32/ctpp/builtins.c 2008-04-28 08:14:42 +0200 +Index: ctpp-1.0.33/ctpp/builtins.c +--- ctpp-1.0.33/ctpp/builtins.c.orig 2008-03-25 21:32:00 +0100 ctpp-1.0.33/ctpp/builtins.c 2008-04-28 08:14:42 +0200 @@ -102,11 +102,12 @@ * config file included above. See the comments in * config/linux-gnu-x86.c @@ -151,9 +151,9 @@ +#endif return FALSE; } -Index: ctpp-1.0.32/ctpp/ccompat.c ctpp-1.0.32/ctpp/ccompat.c.orig 2008-03-26 08:53:09 +0100 -+++ ctpp-1.0.32/ctpp/ccompat.c 2008-04-28 08:14:42 +0200 +Index: ctpp-1.0.33/ctpp/ccompat.c +--- ctpp-1.0.33/ctpp/ccompat.c.orig 2008-03-26 08:53:09 +0100 ctpp-1.0.33/ctpp/ccompat.c 2008-04-28 08:14:42 +0200 @@ -55,8 +55,10 @@ char cpp_subdir[FILENAME_MAX]; @@ -174,9 +174,9 @@ strcpy (cc_path, which ("cc")); cc_include_paths[1] = strdup ("/usr/include"); -Index: ctpp-1.0.32/ctpp/i_opt.c ctpp-1.0.32/ctpp/i_opt.c.orig2008-04-26 08:20:51 +0200 -+++ ctpp-1.0.32/ctpp/i_opt.c 2008-04-28 08:14:42 +0200 +Index: ctpp-1.0.33/ctpp/i_opt.c +--- ctpp-1.0.33/ctpp/i_opt.c.orig2008-04-26 08:20:51 +0200 ctpp-1.0.33/ctpp/i_opt.c 2008-04-28 08:14:42 +0200 @@ -30,6 +30,8 @@ #include #include @@ -186,9 +186,9 @@ #include "ctpp.h" extern char source_file[FILENAME_MAX]; /* Declared in rtinfo.c. */ -Index: ctpp-1.0.32/libctpp/lex.c ctpp-1.0.32/libctpp/lex.c.orig 2008-01-01 16:05:53 +0100 -+++ ctpp-1.0.32/libctpp/lex.c2008-04-28 08:14:42 +0200 +Index: ctpp-1.0.33/libctpp/lex.c +--- ctpp-1.0.33/libctpp/lex.c.orig 2008-01-01 16:05:53 +0100 ctpp-1.0.33/libctpp/lex.c2008-04-28 08:14:42 +0200 @@ -26,6 +26,8 @@ #include #include @@ . patch -p0 <<'@@ .' Index: openpkg-src/ctalk/ctalk.spec $ cvs diff -u -r1.60 -r1.61 ctalk.spec --- openpkg-src/ctalk/ctalk.spec 19 May 2008 15:53:02 - 1.60 +++ openpkg-src/ctalk/ctalk.spec 23 May 2008 08:41:26 - 1.61 @@ -23,7 +23,7 @@ # package versions %define V_ctalk 0.0.52a -%define V_ctpp 1.0.32 +%define V_ctpp 1.0.33 # package information Name: ctalk @@ -36,7 +36,7 @@ Group:Language License: GPL Version: %{V_ctalk} -Release: 20080519 +Release: 20080523 # list of sources Source0: http://www.ctalklang.org/files/ctalk-%{V_ctalk}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org