date:20080614

[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec

2008-06-14 Thread Ralf S. Engelschall

 @@
++cols;
   Index: server/Makefile.in
   --- server/Makefile.in.orig  2006-03-09 22:29:55 +0100
  -+++ server/Makefile.in   2007-09-10 20:17:11 +0200
   server/Makefile.in   2008-06-13 23:59:56 +0200
   @@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp  touch $$tmp; \
  @@ -159,21 +159,9 @@
done; \
for dir in $(EXPORT_DIRS_APR); do \
(ls $$dir/ap[ru].h $$dir/ap[ru]_*.h  $$tmp 2/dev/null); \
  -Index: srclib/apr-util/crypto/getuuid.c
   srclib/apr-util/crypto/getuuid.c.orig2006-04-14 20:01:58 +0200
  -+++ srclib/apr-util/crypto/getuuid.c 2007-09-10 20:17:11 +0200
  -@@ -131,7 +131,7 @@
  - 
  - /* crap. this isn't crypto quality, but it will be Good Enough */
  - 
  --get_system_time(time_now);
  -+time_now = apr_time_now();
  - srand((unsigned int)(((time_now  32) ^ time_now)  0x));
  - 
  - return rand()  0x0;
   Index: support/Makefile.in
   --- support/Makefile.in.orig 2005-07-07 01:15:34 +0200
  -+++ support/Makefile.in  2007-09-10 20:17:11 +0200
   support/Makefile.in  2008-06-13 23:59:56 +0200
   @@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
  @@ -189,7 +177,7 @@
htpasswd: $(htpasswd_OBJECTS)
   Index: support/apachectl.in
   --- support/apachectl.in.orig2006-07-12 05:38:44 +0200
  -+++ support/apachectl.in 2007-09-10 20:17:11 +0200
   support/apachectl.in 2008-06-13 23:59:56 +0200
   @@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
  @@ -204,7 +192,7 @@
# programs may work.  
   Index: support/apxs.in
   --- support/apxs.in.orig 2006-07-12 05:38:44 +0200
  -+++ support/apxs.in  2007-09-10 20:17:11 +0200
   support/apxs.in  2008-06-13 23:59:56 +0200
   @@ -190,9 +190,6 @@
my $httpd = get_vars(sbindir) . / . get_vars(progname);
$httpd = eval qq($httpd);
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/apache/apache.spec
  
  $ cvs diff -u -r1.434 -r1.435 apache.spec
  --- openpkg-src/apache/apache.spec2 Apr 2008 09:50:33 -   1.434
  +++ openpkg-src/apache/apache.spec14 Jun 2008 07:02:35 -  1.435
  @@ -31,8 +31,8 @@
   Class:BASE
   Group:Web
   License:  ASF
  -Version:  2.2.8
  -Release:  20080402
  +Version:  2.2.9
  +Release:  20080614
   
   #   package options
   %option   with_mpm_prefork  yes
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/wine/ wine.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 09:28:28
  Branch: HEAD Handle: 2008061408282700

  Modified files:
openpkg-src/winewine.spec

  Log:
upgrading package: wine 1.0rc1 - 1.0rc5

  Summary:
RevisionChanges Path
1.107   +4  -3  openpkg-src/wine/wine.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/wine/wine.spec
  
  $ cvs diff -u -r1.106 -r1.107 wine.spec
  --- openpkg-src/wine/wine.spec10 May 2008 09:53:41 -  1.106
  +++ openpkg-src/wine/wine.spec14 Jun 2008 07:28:27 -  1.107
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define   V_opkg 1.0rc1
  -%define   V_dist 1.0-rc1
  +%define   V_opkg 1.0rc5
  +%define   V_dist 1.0-rc5
   
   #   package information
   Name: wine
  @@ -36,7 +36,7 @@
   Group:XWindow
   License:  LGPL
   Version:  %{V_opkg}
  -Release:  20080510
  +Release:  20080614
   
   #   list of sources
   Source0:  
http://ibiblio.org/pub/linux/system/emulators/wine/wine-%{V_dist}.tar.bz2
  @@ -91,6 +91,7 @@
   ./configure \
   --prefix=%{l_prefix} \
   --mandir=%{l_prefix}/man \
  +--without-freetype \
   --disable-trace \
   --disable-debug || true
   
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/perl-conv/ perl-conv.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 09:31:00
  Branch: HEAD Handle: 200806140831

  Modified files:
openpkg-src/perl-conv   perl-conv.spec

  Log:
modifying package: perl-conv-5.10.0 20080308 - 20080614

  Summary:
RevisionChanges Path
1.54+2  -2  openpkg-src/perl-conv/perl-conv.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/perl-conv/perl-conv.spec
  
  $ cvs diff -u -r1.53 -r1.54 perl-conv.spec
  --- openpkg-src/perl-conv/perl-conv.spec  8 Mar 2008 08:03:42 -   
1.53
  +++ openpkg-src/perl-conv/perl-conv.spec  14 Jun 2008 07:31:00 -  
1.54
  @@ -28,7 +28,7 @@
   %define   V_convert_ebcdic   0.06
   %define   V_convert_scalar   1.04
   %define   V_convert_units0.43
  -%define   V_convert_uulib1.09
  +%define   V_convert_uulib1.11
   %define   V_convert_tnef 0.17
   
   #   package information
  @@ -42,7 +42,7 @@
   Group:Perl
   License:  GPL/Artistic
   Version:  %{V_perl}
  -Release:  20080308
  +Release:  20080614
   
   #   list of sources
   Source0:  
http://www.cpan.org/modules/by-module/Convert/Convert-ASN1-%{V_convert_asn1}.tar.gz
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/perl-devel/ perl-devel.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 09:31:08
  Branch: HEAD Handle: 2008061408310800

  Modified files:
openpkg-src/perl-devel  perl-devel.spec

  Log:
modifying package: perl-devel-5.10.0 20080407 - 20080614

  Summary:
RevisionChanges Path
1.37+2  -2  openpkg-src/perl-devel/perl-devel.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/perl-devel/perl-devel.spec
  
  $ cvs diff -u -r1.36 -r1.37 perl-devel.spec
  --- openpkg-src/perl-devel/perl-devel.spec7 Apr 2008 15:23:53 -   
1.36
  +++ openpkg-src/perl-devel/perl-devel.spec14 Jun 2008 07:31:08 -  
1.37
  @@ -24,7 +24,7 @@
   #   versions of individual parts
   %define   V_perl5.10.0
   %define   V_devel_callstack 0.19
  -%define   V_devel_stacktrace1.18
  +%define   V_devel_stacktrace1.19
   %define   V_devel_size  0.69
   %define   V_devel_size_report   0.13
   %define   V_devel_trace 0.10
  @@ -45,7 +45,7 @@
   Group:Perl
   License:  GPL/Artistic
   Version:  %{V_perl}
  -Release:  20080407
  +Release:  20080614
   
   #   list of sources
   Source0:  
http://www.cpan.org/modules/by-module/Devel/Devel-CallStack-%{V_devel_callstack}.tar.gz
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/ctalk/ ctalk.patch ctalk.spec

2008-06-14 Thread Ralf S. Engelschall

  -%define   V_ctalk 0.0.55a
  +%define   V_ctalk 0.0.56a
   %define   V_ctpp  1.0.34
   
   #   package information
  @@ -36,7 +36,7 @@
   Group:Language
   License:  GPL
   Version:  %{V_ctalk}
  -Release:  20080609
  +Release:  20080614
   
   #   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

[CVS] OpenPKG: openpkg-src/perl-www/ perl-www.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 09:37:28
  Branch: HEAD Handle: 2008061408372700

  Modified files:
openpkg-src/perl-wwwperl-www.spec

  Log:
modifying package: perl-www-5.10.0 20080606 - 20080614

  Summary:
RevisionChanges Path
1.421   +2  -2  openpkg-src/perl-www/perl-www.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/perl-www/perl-www.spec
  
  $ cvs diff -u -r1.420 -r1.421 perl-www.spec
  --- openpkg-src/perl-www/perl-www.spec6 Jun 2008 20:22:14 -   
1.420
  +++ openpkg-src/perl-www/perl-www.spec14 Jun 2008 07:37:27 -  
1.421
  @@ -58,7 +58,7 @@
   %define   V_cgi_pathrequest   1.18
   %define   V_fcgi  0.67
   %define   V_rpc_xml   0.60
  -%define   V_soap_lite 0.710.06
  +%define   V_soap_lite 0.710.07
   %define   V_soap_lite_smartproxy  0.11
   %define   V_soap_payload  1.02
   %define   V_net_google1.0.1
  @@ -98,7 +98,7 @@
   Group:Perl
   License:  GPL/Artistic
   Version:  %{V_perl}
  -Release:  20080606
  +Release:  20080614
   
   #   package options
   %option   with_curl  no
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 09:59:16
  Branch: HEAD Handle: 2008061408591600

  Modified files:
openpkg-src/drupal  drupal.spec

  Log:
reroll with updated 1.x-dev modules

  Summary:
RevisionChanges Path
1.278   +1  -1  openpkg-src/drupal/drupal.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/drupal/drupal.spec
  
  $ cvs diff -u -r1.277 -r1.278 drupal.spec
  --- openpkg-src/drupal/drupal.spec13 Jun 2008 22:00:36 -  1.277
  +++ openpkg-src/drupal/drupal.spec14 Jun 2008 07:59:16 -  1.278
  @@ -225,7 +225,7 @@
   Group:CMS
   License:  GPL
   Version:  %{V_drupal}
  -Release:  20080613
  +Release:  20080614
   
   #   package options
   %option   with_mysql   yes
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/gcc44/ gcc44.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 10:17:27
  Branch: HEAD Handle: 2008061409172500

  Modified files:
openpkg-src/gcc44   gcc44.spec

  Log:
upgrading package: gcc44 4.4s20080606 - 4.4s20080613

  Summary:
RevisionChanges Path
1.15+2  -2  openpkg-src/gcc44/gcc44.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/gcc44/gcc44.spec
  
  $ cvs diff -u -r1.14 -r1.15 gcc44.spec
  --- openpkg-src/gcc44/gcc44.spec  7 Jun 2008 09:01:44 -   1.14
  +++ openpkg-src/gcc44/gcc44.spec  14 Jun 2008 08:17:25 -  1.15
  @@ -28,7 +28,7 @@
   #   package version
   %define   V_full 4.4
   %define   V_comp 44
  -%define   V_snap 20080606
  +%define   V_snap 20080613
   
   #   package information
   Name: gcc44
  @@ -41,7 +41,7 @@
   Group:Compiler
   License:  GPL
   Version:  %{V_full}s%{V_snap}
  -Release:  20080607
  +Release:  20080614
   
   #   package options
   %option   with_binutils  yes
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 11:30:54
  Branch: HEAD Handle: 2008061410305300

  Modified files:
openpkg-src/drupal  drupal.spec

  Log:
only the development snapshot of FlexiFilter seems to work with Drupal
6.2

  Summary:
RevisionChanges Path
1.279   +1  -1  openpkg-src/drupal/drupal.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/drupal/drupal.spec
  
  $ cvs diff -u -r1.278 -r1.279 drupal.spec
  --- openpkg-src/drupal/drupal.spec14 Jun 2008 07:59:16 -  1.278
  +++ openpkg-src/drupal/drupal.spec14 Jun 2008 09:30:53 -  1.279
  @@ -77,7 +77,7 @@
   %define   V_module_flash_gallery   6.x-1.x-dev
   %define   V_module_flashnode   6.x-1.1
   %define   V_module_flashvideo  6.x-1.3
  -%define   V_module_flexifilter 6.x-1.1-rc1
  +%define   V_module_flexifilter 6.x-1.x-dev
   %define   V_module_flexifilter_cite6.x-1.0
   %define   V_module_footermap   6.x-1.2
   %define   V_module_footnotes   6.x-1.1
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 15:14:47
  Branch: HEAD Handle: 2008061414144600

  Modified files:
openpkg-src/drupal  drupal.patch

  Log:
fix 'simplefeed' module update under PostgreSQL

  Summary:
RevisionChanges Path
1.21+28 -1  openpkg-src/drupal/drupal.patch
  

  patch -p0 '@@ .'
  Index: openpkg-src/drupal/drupal.patch
  
  $ cvs diff -u -r1.20 -r1.21 drupal.patch
  --- openpkg-src/drupal/drupal.patch   30 May 2008 19:18:50 -  1.20
  +++ openpkg-src/drupal/drupal.patch   14 Jun 2008 13:14:46 -  1.21
  @@ -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.20 2008/05/30 19:18:50 rse Exp $ */
  ++/* $Id: drupal.patch,v 1.21 2008/06/14 13:14:46 rse Exp $ */
   +
   +function launch_popup(nid, mw, mh) {
   +var ox = mw;
  @@ -700,3 +700,30 @@
}


  +-
  +
  +Fix upgrading in simplefeed module if PostgreSQL is used.
  +
  +Index: sites/all/modules/simplefeed/simplefeed.install
  +--- sites/all/modules/simplefeed/simplefeed.install.orig 2008-06-11 
07:22:28 +0200
   sites/all/modules/simplefeed/simplefeed.install  2008-06-14 15:09:53 
+0200
  +@@ -31,8 +31,17 @@
  + 
  + function simplefeed_update_2() {
  +   $ret = array();
  +-  $ret[] = update_sql(ALTER TABLE {simplefeed_feed} DROP INDEX url);
  +-  $ret[] = update_sql(ALTER TABLE {simplefeed_feed} CHANGE url url text); 
 
  ++  switch ($GLOBALS['db_type']) {
  ++case 'mysql':
  ++case 'mysqli':
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed} DROP INDEX url);
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed} CHANGE url url 
text);  
  ++  break;
  ++case 'pgsql':
  ++  $ret[] = update_sql(DROP INDEX {simplefeed_feed}_url_idx);
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed} ALTER COLUMN url 
TYPE text);  
  ++  break;
  ++  }
  +   return $ret;
  + }
  + 
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 16:01:06
  Branch: HEAD Handle: 2008061415010500

  Modified files:
openpkg-src/drupal  drupal.patch

  Log:
Fix modules as Drupal 6.2 does not provide db_num_rows() anymore.

  Summary:
RevisionChanges Path
1.22+40 -1  openpkg-src/drupal/drupal.patch
  

  patch -p0 '@@ .'
  Index: openpkg-src/drupal/drupal.patch
  
  $ cvs diff -u -r1.21 -r1.22 drupal.patch
  --- openpkg-src/drupal/drupal.patch   14 Jun 2008 13:14:46 -  1.21
  +++ openpkg-src/drupal/drupal.patch   14 Jun 2008 14:01:05 -  1.22
  @@ -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.21 2008/06/14 13:14:46 rse Exp $ */
  ++/* $Id: drupal.patch,v 1.22 2008/06/14 14:01:05 rse Exp $ */
   +
   +function launch_popup(nid, mw, mh) {
   +var ox = mw;
  @@ -727,3 +727,42 @@
  return $ret;
}

  +-
  +
  +Fix modules as Drupal 6.2 does not provide db_num_rows() anymore.
  +
  +Index: sites/all/modules/simplefeed/simplefeed_item.install
  +--- sites/all/modules/simplefeed/simplefeed_item.install.orig
2008-06-11 07:22:28 +0200
   sites/all/modules/simplefeed/simplefeed_item.install 2008-06-14 
15:49:19 +0200
  +@@ -40,13 +40,15 @@
  +   // Fetch up to N feed items and update their iids to new schema
  +   $count = $_SESSION['simplefeed_item_update_2']['count'];
  +   $feed_items = db_query_range('SELECT r.vid, r.title, s.url FROM 
{node_revisions} r JOIN {simplefeed_feed_item} s ON r.vid = s.vid ORDER BY 
r.vid ASC', $count, $limit);
  ++  $n = 0;
  +   while ($feed_item = db_fetch_object($feed_items)) {
  + $iid = md5($feed_item-title . $feed_item-url);
  + db_query(UPDATE {simplefeed_feed_item} SET iid = '%s' WHERE vid = %d, 
$iid, $feed_item-vid);
  + $_SESSION['simplefeed_item_update_2']['vid'] = $feed_item-vid;
  ++$n++;
  +   }
  + 
  +-  if (db_num_rows($feed_items) == $limit) {
  ++  if ($n == $limit) {
  + $_SESSION['simplefeed_item_update_2']['count'] += $limit;
  + // Return progress (never return 100% here to ensure clean-up is still 
run last).
  + return array('#finished' = 
$_SESSION['simplefeed_item_update_2']['vid'] / 
($_SESSION['simplefeed_item_update_2']['max'] + 1));
  +Index: sites/all/modules/autologout/autologout.module
  +--- sites/all/modules/autologout/autologout.module.orig  2008-03-14 
21:05:41 +0100
   sites/all/modules/autologout/autologout.module   2008-06-14 15:57:27 
+0200
  +@@ -257,8 +257,8 @@
  +   if (_autologout_user_in_by_user_role($account)) {
  + $account-autologout = 0;
  + $r = db_query(SELECT setting FROM {autologout} WHERE uid = %d, 
$account-uid);
  +-if (db_num_rows($r)  0) {
  +-  $row = db_fetch_object($r);
  ++$row = db_fetch_object($r);
  ++if ($row) {
  +   $account-autologout = (int)$row-setting;
  + }
  +   }
  +
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 16:26:35
  Branch: HEAD Handle: 2008061415263400

  Modified files:
openpkg-src/drupal  drupal.patch

  Log:
Ok, the 'simplefeed' author seems to be a MySQL-only developer, so we
have to patch even more

  Summary:
RevisionChanges Path
1.23+24 -6  openpkg-src/drupal/drupal.patch
  

  patch -p0 '@@ .'
  Index: openpkg-src/drupal/drupal.patch
  
  $ cvs diff -u -r1.22 -r1.23 drupal.patch
  --- openpkg-src/drupal/drupal.patch   14 Jun 2008 14:01:05 -  1.22
  +++ openpkg-src/drupal/drupal.patch   14 Jun 2008 14:26:34 -  1.23
  @@ -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.22 2008/06/14 14:01:05 rse Exp $ */
  ++/* $Id: drupal.patch,v 1.23 2008/06/14 14:26:34 rse Exp $ */
   +
   +function launch_popup(nid, mw, mh) {
   +var ox = mw;
  @@ -703,6 +703,7 @@
   -
   
   Fix upgrading in simplefeed module if PostgreSQL is used.
  +Fix modules as Drupal 6.2 does not provide db_num_rows() anymore.
   
   Index: sites/all/modules/simplefeed/simplefeed.install
   --- sites/all/modules/simplefeed/simplefeed.install.orig 2008-06-11 
07:22:28 +0200
  @@ -727,13 +728,9 @@
  return $ret;
}

  --
  -
  -Fix modules as Drupal 6.2 does not provide db_num_rows() anymore.
  -
   Index: sites/all/modules/simplefeed/simplefeed_item.install
   --- sites/all/modules/simplefeed/simplefeed_item.install.orig
2008-06-11 07:22:28 +0200
  -+++ sites/all/modules/simplefeed/simplefeed_item.install 2008-06-14 
15:49:19 +0200
   sites/all/modules/simplefeed/simplefeed_item.install 2008-06-14 
16:23:01 +0200
   @@ -40,13 +40,15 @@
  // Fetch up to N feed items and update their iids to new schema
  $count = $_SESSION['simplefeed_item_update_2']['count'];
  @@ -751,6 +748,27 @@
$_SESSION['simplefeed_item_update_2']['count'] += $limit;
// Return progress (never return 100% here to ensure clean-up is still 
run last).
return array('#finished' = 
$_SESSION['simplefeed_item_update_2']['vid'] / 
($_SESSION['simplefeed_item_update_2']['max'] + 1));
  +@@ -60,8 +62,18 @@
  + 
  + function simplefeed_item_update_3() {
  +   $ret = array();
  +-  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} CHANGE url url 
text);
  +-  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} CHANGE iid iid 
varchar(32) NOT NULL);  
  ++  switch ($GLOBALS['db_type']) {
  ++case 'mysql':
  ++case 'mysqli':
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} CHANGE url 
url text);
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} CHANGE iid 
iid varchar(32) NOT NULL);  
  ++  break;
  ++case 'pgsql':
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} ALTER COLUMN 
url TYPE text);  
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} ALTER COLUMN 
iid TYPE VARCHAR(32));  
  ++  $ret[] = update_sql(ALTER TABLE {simplefeed_feed_item} ALTER COLUMN 
iid SET NOT NULL);  
  ++  break;
  ++  }
  +   return $ret;
  + }
  + 
   Index: sites/all/modules/autologout/autologout.module
   --- sites/all/modules/autologout/autologout.module.orig  2008-03-14 
21:05:41 +0100
   +++ sites/all/modules/autologout/autologout.module   2008-06-14 15:57:27 
+0200
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/libxslt/ libxslt.patch libxslt.spec

2008-06-14 Thread Ralf S. Engelschall

  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:   14-Jun-2008 22:18:28
  Branch: HEAD Handle: 2008061421182400

  Added files:
openpkg-src/libxslt libxslt.patch
  Modified files:
openpkg-src/libxslt libxslt.spec

  Log:
apply a few fixes from FreeBSD ports

  Summary:
RevisionChanges Path
1.7 +43 -0  openpkg-src/libxslt/libxslt.patch
1.100   +3  -1  openpkg-src/libxslt/libxslt.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/libxslt/libxslt.patch
  
  $ cvs diff -u -r0 -r1.7 libxslt.patch
  --- /dev/null 2008-06-14 22:18:12 +0200
  +++ libxslt.patch 2008-06-14 22:18:25 +0200
  @@ -0,0 +1,43 @@
  +Index: libexslt/date.c
  +--- libexslt/date.c.orig 2008-04-08 19:18:06 +0200
   libexslt/date.c  2008-06-14 22:05:17 +0200
  +@@ -28,7 +28,7 @@
  + #include config.h
  + #endif
  + 
  +-#if HAVE_LOCALTIME_R/* _POSIX_SOURCE required by gnu libc */
  ++#if defined(HAVE_LOCALTIME_R)  defined(__GLIBC__) /* _POSIX_SOURCE 
required by gnu libc */
  + #ifndef _AIX51  /* but on AIX we're not using gnu libc */
  + #define _POSIX_SOURCE
  + #endif
  +Index: libxslt/extra.c
  +--- libxslt/extra.c.orig 2007-01-03 16:11:57 +0100
   libxslt/extra.c  2008-06-14 22:05:17 +0200
  +@@ -244,7 +244,12 @@
  +  * Calling localtime() has the side-effect of setting timezone.
  +  * After we know the timezone, we can adjust for it
  +  */
  +-lmt = gmt - timezone;
  ++/*
  ++ * May be on some stupid Linux localtime() have such side-effect,
  ++ * but FreeBSD DOESN'T HAVE such side-ffect, so we should use
  ++ * local_tm. 
  ++ */ 
  ++lmt = gmt - local_tm-tm_gmtoff;
  + 
  + /*
  +  * FIXME: it's been too long since I did manual memory management.
  +Index: libxslt/xsltconfig.h.in
  +--- libxslt/xsltconfig.h.in.orig 2007-03-27 16:47:36 +0200
   libxslt/xsltconfig.h.in  2008-06-14 22:05:17 +0200
  +@@ -130,8 +130,10 @@
  +  */
  + #ifdef __GNUC__
  + #ifdef HAVE_ANSIDECL_H
  ++#ifndef __FreeBSD__
  + #include ansidecl.h
  + #endif
  ++#endif
  + #ifndef ATTRIBUTE_UNUSED
  + #define ATTRIBUTE_UNUSED __attribute__((unused))
  + #endif
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/libxslt/libxslt.spec
  
  $ cvs diff -u -r1.99 -r1.100 libxslt.spec
  --- openpkg-src/libxslt/libxslt.spec  23 May 2008 14:23:56 -  1.99
  +++ openpkg-src/libxslt/libxslt.spec  14 Jun 2008 20:18:24 -  1.100
  @@ -32,10 +32,11 @@
   Group:XML
   License:  MIT-style
   Version:  1.1.24
  -Release:  20080523
  +Release:  20080614
   
   #   list of sources
   Source0:  ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz
  +Patch0:   libxslt.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -61,6 +62,7 @@
   
   %prep
   %setup -q
  +%patch -p0
   %{l_shtool} subst \
   -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
   configure
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/libxslt/ libxslt.patch libxslt.spec

2008-06-14 Thread Ralf S. Engelschall

  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/libxslt/libxslt.spec
  
  $ cvs diff -u -r1.100 -r1.101 libxslt.spec
  --- openpkg-src/libxslt/libxslt.spec  14 Jun 2008 20:18:24 -  1.100
  +++ openpkg-src/libxslt/libxslt.spec  14 Jun 2008 20:46:18 -  1.101
  @@ -34,6 +34,10 @@
   Version:  1.1.24
   Release:  20080614
   
  +#   package options
  +%option   with_regexp  no
  +%option   with_crypto  no
  +
   #   list of sources
   Source0:  ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz
   Patch0:   libxslt.patch
  @@ -45,6 +49,14 @@
   PreReq:   OpenPKG, openpkg = 20040130
   BuildPreReq:  libxml = 2.6.32
   PreReq:   libxml = 2.6.32
  +%if %{with_regexp} == yes
  +BuildPreReq:  pcre
  +PreReq:   pcre
  +%endif
  +%if %{with_crypto} == yes
  +BuildPreReq:  gcrypt
  +PreReq:   gcrypt
  +%endif
   AutoReq:  no
   AutoReqProv:  no
   
  @@ -68,16 +80,27 @@
   configure
   
   %build
  -CC=%{l_cc} \
  -CFLAGS=%{l_cflags -O} %{l_cppflags} \
  -CPPFLAGS=%{l_cppflags} \
  -LDFLAGS=%{l_ldflags} \
  -LIBS=-lz -liconv \
  +export CC=%{l_cc}
  +export CFLAGS=%{l_cflags -O} %{l_cppflags}
  +export CPPFLAGS=%{l_cppflags}
  +export LDFLAGS=%{l_ldflags}
  +export LIBS=-lz -liconv
  +%if %{with_regexp} == yes
  +CPPFLAGS=$CPPFLAGS -DEXSLT_REGEXP_ENABLED
  +LIBS=$LIBS -lpcre
  +%{l_shtool} subst \
  +-e 's;\(@[EMAIL PROTECTED]);\1 -lpcre;g' \
  +libexslt.pc.in
  +%endif
   ./configure \
   --prefix=%{l_prefix} \
   --mandir=%{l_prefix}/man \
   --with-libxml-prefix=%{l_prefix} \
  +%if %{with_crypto} == yes
  +--with-crypto \
  +%else
   --without-crypto \
  +%endif
   --without-debug \
   --without-python \
   --disable-shared
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec

[CVS] OpenPKG: openpkg-src/wine/ wine.spec

[CVS] OpenPKG: openpkg-src/perl-conv/ perl-conv.spec

[CVS] OpenPKG: openpkg-src/perl-devel/ perl-devel.spec

[CVS] OpenPKG: openpkg-src/ctalk/ ctalk.patch ctalk.spec

[CVS] OpenPKG: openpkg-src/perl-www/ perl-www.spec

[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec

[CVS] OpenPKG: openpkg-src/gcc44/ gcc44.spec

[CVS] OpenPKG: openpkg-src/drupal/ drupal.spec

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

[CVS] OpenPKG: openpkg-src/drupal/ drupal.patch

[CVS] OpenPKG: openpkg-src/libxslt/ libxslt.patch libxslt.spec

[CVS] OpenPKG: openpkg-src/libxslt/ libxslt.patch libxslt.spec

14 matches

Site Navigation

Mail list logo

Footer information