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

2004-07-27 Thread Torsten Homeyer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   28-Jul-2004 08:46:53
  Branch: HEAD Handle: 2004072807465200

  Modified files:
openpkg-src/openldapopenldap.patch openldap.spec

  Log:
upgrading package: openldap 2.2.14 -> 2.2.15

  Summary:
RevisionChanges Path
1.8 +4  -4  openpkg-src/openldap/openldap.patch
1.114   +2  -2  openpkg-src/openldap/openldap.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.patch
  
  $ cvs diff -u -r1.7 -r1.8 openldap.patch
  --- openpkg-src/openldap/openldap.patch   16 Apr 2004 07:58:27 -  1.7
  +++ openpkg-src/openldap/openldap.patch   28 Jul 2004 06:46:52 -  1.8
  @@ -24,13 +24,13 @@
   +#updateref   ldap://master.example.org
   +
   Index: servers/slapd/Makefile.in
   servers/slapd/Makefile.in.orig   2004-04-12 20:07:40.0 +0200
  -+++ servers/slapd/Makefile.in2004-04-16 09:48:49.0 +0200
  +--- servers/slapd/Makefile.in.orig   2004-07-26 00:31:04 +0200
   servers/slapd/Makefile.in2004-07-28 08:38:37 +0200
   @@ -421,6 +421,6 @@
cd $(DESTDIR)$(sbindir); \
rm -f $(SLAPTOOLS); \
for i in $(SLAPTOOLS); do \
  --$(LN_S) $(libexecdir)/slapd $$i; \
  -+$(LN_S) $(DESTDIR)$(libexecdir)/slapd $$i; \
  +-$(LN_S) $(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
  ++$(LN_S) $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
done

  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  
  $ cvs diff -u -r1.113 -r1.114 openldap.spec
  --- openpkg-src/openldap/openldap.spec6 Jul 2004 11:18:17 -   1.113
  +++ openpkg-src/openldap/openldap.spec28 Jul 2004 06:46:52 -  1.114
  @@ -33,8 +33,8 @@
   Class:BASE
   Group:Database
   License:  GPL
  -Version:  2.2.14
  -Release:  20040706
  +Version:  2.2.15
  +Release:  20040728
   
   #   package options
   %option   with_fsl   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Torsten Homeyer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   28-Jul-2004 08:23:53
  Branch: HEAD Handle: 2004072807235300

  Modified files:
openpkg-src/xterm   xterm.spec

  Log:
upgrading package: xterm 193 -> 194

  Summary:
RevisionChanges Path
1.79+2  -2  openpkg-src/xterm/xterm.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/xterm/xterm.spec
  
  $ cvs diff -u -r1.78 -r1.79 xterm.spec
  --- openpkg-src/xterm/xterm.spec  20 Jul 2004 18:05:10 -  1.78
  +++ openpkg-src/xterm/xterm.spec  28 Jul 2004 06:23:53 -  1.79
  @@ -24,7 +24,7 @@
   ##
   
   #   package versions
  -%define   V_xterm193
  +%define   V_xterm194
   %define   V_xtermset 0.5.2
   %define   V_xtermcontrol 2.4
   
  @@ -39,7 +39,7 @@
   Group:XWindow
   License:  X11
   Version:  %{V_xterm}
  -Release:  20040720
  +Release:  20040728
   
   #   list of sources
   Source0:  ftp://invisible-island.net/xterm/xterm-%{V_xterm}.tgz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/as-gui/ as-gui.spec

2004-07-27 Thread Michael Schloh
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   28-Jul-2004 00:25:16
  Branch: HEAD Handle: 2004072723251600

  Modified files:
openpkg-src/as-gui  as-gui.spec

  Log:
keep track of required libraries after RPM installation as well

  Summary:
RevisionChanges Path
1.57+4  -1  openpkg-src/as-gui/as-gui.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/as-gui/as-gui.spec
  
  $ cvs diff -u -r1.56 -r1.57 as-gui.spec
  --- openpkg-src/as-gui/as-gui.spec7 Feb 2004 17:53:31 -   1.56
  +++ openpkg-src/as-gui/as-gui.spec27 Jul 2004 22:25:16 -  1.57
  @@ -34,7 +34,7 @@
   Group:Editor
   License:  GPL
   Version:  0.7.5
  -Release:  20040207
  +Release:  20040728
   
   #   package options
   %option   with_micoyes
  @@ -49,11 +49,14 @@
   BuildPreReq:  OpenPKG, openpkg >= 20040130, X11
   PreReq:   OpenPKG, openpkg >= 20040130, X11
   BuildPreReq:  qt >= 3.2.3-20031120, pkgconfig, make
  +PreReq:   qt >= 3.2.3-20031120
   %if "%{with_mico}" == "yes"
   BuildPreReq:  mico
  +PreReq:   mico
   %endif
   %if "%{with_esoap}" == "yes"
   BuildPreReq:  easysoap
  +PreReq:   easysoap
   %endif
   AutoReq:  no
   AutoReqProv:  no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
==
  $ cvs diff -u -r1.1 -r1.2 papyrus.spec
  --- openpkg-src/papyrus/papyrus.spec  8 Jun 2004 18:58:48 -   1.1
  +++ openpkg-src/papyrus/papyrus.spec  27 Jul 2004 19:11:17 -  1.2
  @@ -33,8 +33,8 @@
   Class:EVAL
   Group:Database
   License:  GPL
  -Version:  1.3.7
  -Release:  20040608
  +Version:  1.3.8
  +Release:  20040727
   
   #   list of sources
   Source0:  http://papyrus.treshna.com/papyrus-%{version}.tar.gz
  @@ -45,8 +45,8 @@
   BuildRoot:%{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, libtool, gcc, make, pkgconfig
   PreReq:   OpenPKG, openpkg >= 20040130
  -BuildPreReq:  glib, gettext, libiconv, libxml, libxslt
  -PreReq:   glib, gettext, libiconv, libxml, libxslt
  +BuildPreReq:  glib, gettext, libiconv, libxml, libxslt, libgda
  +PreReq:   glib, gettext, libiconv, libxml, libxslt, libgda
   AutoReq:  no
   AutoReqProv:  no
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
ed(__STDC__)
  - case '\a': xbuf[1] = 'a'; break;
  -+#else
  -+case 7:xbuf[1] = 'a'; break;
  -+#endif
  - case '\v': xbuf[1] = 'v'; break;
  - case '\b': xbuf[1] = 'b'; break;
  - case '\f': xbuf[1] = 'f'; break;
   Index: syntax.h
   syntax.h.orig2002-02-25 17:52:37.0 +0100
  -+++ syntax.h 2004-06-04 11:53:49.0 +0200
  +--- syntax.h.orig2004-04-15 05:19:36 +0200
   syntax.h 2004-07-27 19:47:10 +0200
   @@ -21,6 +21,8 @@
#ifndef _SYNTAX_H_
#define _SYNTAX_H_
  @@ -216,15 +128,20 @@
/* Defines for use by mksyntax.c */

#define slashify_in_quotes "\\`$\"\n"
  -Index: builtins/printf.def
   builtins/printf.def.orig 2002-05-13 20:36:04.0 +0200
  -+++ builtins/printf.def  2004-06-04 11:57:44.0 +0200
  -@@ -114,7 +114,7 @@
  - static intmax_t getintmax __P((void));
  - static uintmax_t getuintmax __P((void));
  - 
  --#if defined (HAVE_LONG_DOUBLE) && HAVE_DECL_STRTOLD
  -+#if defined (HAVE_LONG_DOUBLE) && HAVE_DECL_STRTOLD && !defined(HPUX)
  - typedef long double floatmax_t;
  - #  define FLOATMAX_CONV "L"
  - #  define strtofltmax   strtold
  +
  +-
  +
  +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
  +@@ -77,7 +77,7 @@
  + show_shell_version (extended)
  +  int extended;
  + {
  +-  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"));
  + }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/bash/bash.spec
  
  $ cvs diff -u -r1.48 -r1.49 bash.spec
  --- openpkg-src/bash/bash.spec7 Jun 2004 08:34:35 -   1.48
  +++ openpkg-src/bash/bash.spec27 Jul 2004 18:50:06 -  1.49
  @@ -24,10 +24,10 @@
   ##
   
   #   package version
  -%define   V_base_real 2.05b
  -%define   V_base_comp 205b
  -%define   V_plvl_raw  7
  -%define   V_plvl_pad  007
  +%define   V_base_real 3.0
  +%define   V_base_comp 30
  +%define   V_plvl_raw  0
  +%define   V_plvl_pad  000
   
   #   package information
   Name: bash
  @@ -40,19 +40,12 @@
   Group:Shell
   License:  GPL
   Version:  %{V_base_real}.%{V_plvl_raw}
  -Release:  20040607
  +Release:  20040727
   
   #   list of sources
   Source0:  ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
   Source1:  profile
   Patch0:   bash.patch
  -Patch1:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-001
  -Patch2:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-002
  -Patch3:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-003
  -Patch4:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-004
  -Patch5:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-005
  -Patch6:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-006
  -Patch7:   
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-007
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -86,7 +79,7 @@
   %prep
   #   unpack and patch distribution
   %setup -q -n bash-%{V_base_real}
  -%patch -p0 -P 0 1 2 3 4 5 6 7
  +%patch -p0
   
   #   brand with OpenPKG release and fix patchlevel
   %{l_shtool} subst \
  @@ -114,8 +107,11 @@
   ./configure \
   --cache-file=./config.cache \
   --prefix=%{l_prefix} \
  +--disable-multibyte \
  +--enable-debugger \
   --without-gnu-malloc \
  ---without-curses
  +--without-curses \
  +--disable-nls
   %{l_shtool} subst \
   -e 's;^\(#define.*SYS_PROFILE["^]*\).*;\1 "%{l_prefix}/etc/bash/profile";' \
   pathnames.h
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Michael Schloh
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 20:05:12
  Branch: HEAD Handle: 2004072719051200

  Modified files:
openpkg-src/bogofilter  bogofilter.spec

  Log:
upgrading package: bogofilter 0.92.2 -> 0.92.3

  Summary:
RevisionChanges Path
1.57+2  -2  openpkg-src/bogofilter/bogofilter.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/bogofilter/bogofilter.spec
  
  $ cvs diff -u -r1.56 -r1.57 bogofilter.spec
  --- openpkg-src/bogofilter/bogofilter.spec15 Jul 2004 08:15:16 -  1.56
  +++ openpkg-src/bogofilter/bogofilter.spec27 Jul 2004 18:05:12 -  1.57
  @@ -33,8 +33,8 @@
   Class:BASE
   Group:Text
   License:  GPL
  -Version:  0.92.2
  -Release:  20040715
  +Version:  0.92.3
  +Release:  20040727
   
   #   list of sources
   Source0:  
http://osdn.dl.sourceforge.net/sourceforge/bogofilter/bogofilter-%{version}.tar.bz2
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/ucarp/ fsl.ucarp rc.ucarp ucarp.spec vip-do...

2004-07-27 Thread Michael Schloh
RANTIES 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: ucarp
  +Summary:  Common Address Redundancy Protocol for Unix
  +URL:  http://www.ucarp.org/
  +Vendor:   Frank Denis
  +Packager: The OpenPKG Project
  +Distribution: OpenPKG
  +Class:EVAL
  +Group:Network
  +License:  Specific
  +Version:  1.0
  +Release:  20040727
  +
  +#   package options
  +%option   with_fsl  yes
  +
  +#   list of sources
  +Source0:  http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2
  +Source1:  rc.ucarp
  +Source2:  fsl.ucarp
  +Source3:  vip-up.sh
  +Source4:  vip-down.sh
  +
  +#   build information
  +Prefix:   %{l_prefix}
  +BuildRoot:%{l_buildroot}
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, libpcap, libiconv, gcc
  +PreReq:   OpenPKG, openpkg >= 20040130, libpcap, libiconv
  +%if "%{with_fsl}" == "yes"
  +BuildPreReq:  fsl >= 1.3.0
  +PreReq:   fsl >= 1.3.0
  +%endif
  +AutoReq:  no
  +AutoReqProv:  no
  +
  +%description
  +UCARP allows a couple of hosts to share common virtual IP
  +addresses in order to provide automatic failover. It is a
  +portable userland implementation of the secure and patent-
  +free Common Address Redundancy Protocol (CARP, OpenBSD's
  +alternative to the VRRP).
  +
  +Strong points of the CARP protocol are: very low overhead,
  +cryptographically signed messages, interoperability between
  +different operating systems, and no need for any dedicated
  +extra network link between redundant hosts.
  +
  +%track
  +prog ucarp = {
  +version   = %{version}
  +url   = http://www.pureftpd.org/ucarp/
  +regex = ucarp-(__VER__)\.tar\.bz2
  +}
  +
  +%prep
  +%setup -q
  +%{l_shtool} subst \
  +-e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
  +src/ip_carp.h \
  +src/ucarp.h \
  +src/carp.c
  +case "%{l_platform -t}" in
  +*-sunos* )
  +%{l_shtool} subst \
  +-e 's;\(->ether_.host\)\(\[[0-9]*\]\);\1.ether_addr_octet\2;g' \
  +src/carp.c
  +%{l_shtool} subst \
  +-e 's;\(->ether_.host\),;\1.ether_addr_octet,;g' \
  +src/garp.c
  +;;
  +esac
  +
  +%build
  +#   compensate for nonportable constructs
  +DEFFLAGS=
  +LIBFLAGS=
  +case "%{l_platform -t}" in
  +*-sunos* )
  +DEFFLAGS="-DETHER_ADDR_LEN=6"
  +LIBFLAGS="-lresolv"
  +;;
  +esac
  +
  +#   configure program
  +CC="%{l_cc}" \
  +CFLAGS="%{l_cflags -O} $DEFFLAGS" \
  +CPPFLAGS="%{l_cppflags}" \
  +LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
  +LIBS="%{l_fsl_libs} -lpcap $LIBFLAGS" \
  +./configure \
  +--disable-nls \
  +--prefix=%{l_prefix} \
  +--sysconfdir=%{l_prefix}/etc/ucarp \
  +--localstatedir=%{l_prefix}/var/ucarp \
  +--with-libiconv-prefix=%{l_prefix}
  +
  +#   build program
  +%{l_make} %{l_mflags -O}
  +
  +%install
  +#   install program
  +rm -rf $RPM_BUILD_ROOT
  +%{l_make} %{l_mflags} install-strip AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
  +
  +#   create directory structure
  +%{l_shtool} mkdir -f -p -m 755 \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/ucarp \
  +$RPM_BUILD_ROOT%{l_prefix}/var/ucarp
  +
  +#   install default configuration
  +%{l_shtool} install -c -m 644 \
  +%{SOURCE vip-down.sh} \
  +%{SOURCE vip-up.sh} \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/ucarp/
  +
  +#   install runcommand script
  +%{l_shtool} install -c -m 755 %{l_value -s -a} \
  +%{SOURCE rc.ucarp} \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +
  +#   install OSSP fsl configuration
  +%{l_shtool} install -c -m 644 %{l_value -s -a} \
  +%{SOURCE fsl.ucarp} \
  +$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
  +
  +#   determine installation files
  +%{l_rpmto

[CVS] OpenPKG: OPENPKG_2_1_SOLID: openpkg-src/postfix/ postfix.spec

2004-07-27 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 17:09:57
  Branch: OPENPKG_2_1_SOLIDHandle: 2004072716095600

  Modified files:   (Branch: OPENPKG_2_1_SOLID)
openpkg-src/postfix postfix.spec

  Log:
reroll with updated conflict-free WHOSON patch

  Summary:
RevisionChanges Path
1.204.2.3   +1  -1  openpkg-src/postfix/postfix.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.204.2.2 -r1.204.2.3 postfix.spec
  --- openpkg-src/postfix/postfix.spec  25 Jul 2004 07:47:19 -  1.204.2.2
  +++ openpkg-src/postfix/postfix.spec  27 Jul 2004 15:09:56 -  1.204.2.3
  @@ -40,7 +40,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  2.1.1
  +Release:  2.1.2
   
   #   package options
   %option   with_fsl   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 17:09:08
  Branch: HEAD Handle: 2004072716090800

  Modified files:
openpkg-src/postfix postfix.spec

  Log:
reroll with updated conflict-free WHOSON patch

  Summary:
RevisionChanges Path
1.207   +1  -1  openpkg-src/postfix/postfix.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.206 -r1.207 postfix.spec
  --- openpkg-src/postfix/postfix.spec  25 Jul 2004 07:43:53 -  1.206
  +++ openpkg-src/postfix/postfix.spec  27 Jul 2004 15:09:08 -  1.207
  @@ -42,7 +42,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  20040725
  +Release:  20040727
   
   #   package options
   %option   with_fsl   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 16:37:58
  Branch: HEAD Handle: 2004072715375700

  Modified files:
openpkg-src/mysql41 mysql41.spec

  Log:
Hoopala! Who the hell has said that a versioned package like this
one can be of class BASE? Oh, it was me during the release engineering
for OpenPKG 2.0! Well, seems like I was on crack at this time, so
revert this and please do not tell this to anybody. Thanks.

  Summary:
RevisionChanges Path
1.14+2  -2  openpkg-src/mysql41/mysql41.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql41/mysql41.spec
  
  $ cvs diff -u -r1.13 -r1.14 mysql41.spec
  --- openpkg-src/mysql41/mysql41.spec  2 Jul 2004 08:02:37 -   1.13
  +++ openpkg-src/mysql41/mysql41.spec  27 Jul 2004 14:37:57 -  1.14
  @@ -36,11 +36,11 @@
   Vendor:   MySQL AB
   Packager: The OpenPKG Project
   Distribution: OpenPKG
  -Class:BASE
  +Class:PLUS
   Group:Database
   License:  GPL
   Version:  %{V_opkg}
  -Release:  20040702
  +Release:  20040727
   
   #   package options
   %option   with_bdb   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Christoph Schug
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Christoph Schug
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 15:19:15
  Branch: HEAD Handle: 2004072714191400

  Modified files:
openpkg-src/teapop  teapop.spec

  Log:
build breaks if tcpd.h is found due to lack of %{l_cppflags}

  Summary:
RevisionChanges Path
1.45+2  -2  openpkg-src/teapop/teapop.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/teapop/teapop.spec
  
  $ cvs diff -u -r1.44 -r1.45 teapop.spec
  --- openpkg-src/teapop/teapop.spec8 Jun 2004 15:44:10 -   1.44
  +++ openpkg-src/teapop/teapop.spec27 Jul 2004 13:19:14 -  1.45
  @@ -34,7 +34,7 @@
   Group:Mail
   License:  BSD
   Version:  0.3.8
  -Release:  20040608
  +Release:  20040727
   
   #   package options
   %option   with_fsl yes
  @@ -87,7 +87,7 @@
   
   %build
   CC="%{l_cc}" \
  -CFLAGS="%{l_cflags}" \
  +CFLAGS="%{l_cflags} %{l_cppflags}" \
   CPPFLAGS="%{l_cppflags}" \
   LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
   LIBS="%{l_fsl_libs}" \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 15:12:20
  Branch: HEAD Handle: 2004072714122000

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

  Log:
resurrect part of the old patch

  Summary:
RevisionChanges Path
1.12+11 -0  openpkg-src/mplayer/mplayer.patch
1.82+2  -0  openpkg-src/mplayer/mplayer.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.patch
  
  $ cvs diff -u -r0 -r1.12 mplayer.patch
  --- /dev/null 2004-07-27 15:12:20 +0200
  +++ mplayer.patch 2004-07-27 15:12:20 +0200
  @@ -0,0 +1,11 @@
  +--- loader/Makefile.orig Mon Mar 10 17:21:18 2003
   loader/Makefile  Mon Aug 11 11:32:05 2003
  +@@ -17,7 +17,7 @@
  + # Note: -D_FILE_OFFSET_BITS=32 is required to disable using mmap64(),
  + # as it's broken in glibc 2.1.2 (bad header) and 2.1.3 (bad code)
  + WARN_FLAGS = 
  +-CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS) 
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
  ++CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS) 
-fno-omit-frame-pointer
  + #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
  + 
  + all: libloader.a
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.spec
  
  $ cvs diff -u -r1.81 -r1.82 mplayer.spec
  --- openpkg-src/mplayer/mplayer.spec  27 Jul 2004 07:38:14 -  1.81
  +++ openpkg-src/mplayer/mplayer.spec  27 Jul 2004 13:12:20 -  1.82
  @@ -52,6 +52,7 @@
   Source3:  ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/qt5dlls.tar.bz2
   Source4:  ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
   Source5:  http://www.live.com/liveMedia/public/live.%{V_live}.tar.gz
  +Patch0:   mplayer.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -96,6 +97,7 @@
   %prep
   %setup -q -n MPlayer-%{V_mplayer}
   %setup -q -n MPlayer-%{V_mplayer} -T -D -a 5
  +%patch -p0
   %{l_shtool} subst \
   -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
   drivers/radeon/radeonfb.c \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Michael Schloh
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 13:39:28
  Branch: HEAD Handle: 2004072712392700

  Modified files:
openpkg-src/scribus scribus.spec

  Log:
requires make (to correctly compile MOC files) and gimp (for runtime
inplace edition), and further DESTDIR Makefile substitutions

  Summary:
RevisionChanges Path
1.35+7  -8  openpkg-src/scribus/scribus.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/scribus/scribus.spec
  
  $ cvs diff -u -r1.34 -r1.35 scribus.spec
  --- openpkg-src/scribus/scribus.spec  16 Jun 2004 17:08:49 -  1.34
  +++ openpkg-src/scribus/scribus.spec  27 Jul 2004 11:39:27 -  1.35
  @@ -34,7 +34,7 @@
   Group:Editor
   License:  GPL
   Version:  1.1.7
  -Release:  20040616
  +Release:  20040727
   
   #   list of sources
   Source0:  http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
  @@ -45,9 +45,9 @@
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, qt, freetype, libart
  -BuildPreReq:  ghostscript, png, jpeg, tiff, zlib, lcms, pkgconfig
  +BuildPreReq:  ghostscript, png, jpeg, tiff, zlib, lcms, pkgconfig, make
   PreReq:   OpenPKG, openpkg >= 20040130, qt, freetype, libart
  -PreReq:   ghostscript, png, jpeg, tiff, zlib, lcms
  +PreReq:   ghostscript, png, jpeg, tiff, zlib, lcms, gimp
   AutoReq:  no
   AutoReqProv:  no
   
  @@ -80,17 +80,16 @@
   scribus/profiles/Makefile.in \
   scribus/qm/Makefile.in \
   scribus/plugins/psimport/Makefile.in \
  -scribus/plugins/fontpreview/Makefile.in
  +scribus/plugins/fontpreview/Makefile.in \
  +scribus/plugins/scriptplugin/doc/en/Makefile.in
   %{l_shtool} subst \
   -e 's;\(pluginsdir = \)$(DESTDIR)\($(prefix)\);\1\2;' \
  +scribus/plugins/fontpreview/Makefile.in \
   scribus/plugins/psimport/Makefile.in \
  -scribus/plugins/fontpreview/Makefile.in
  -%{l_shtool} subst \
  --e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
   scribus/libpostscript/Makefile.in \
   scribus/libpdf/Makefile.in
   %{l_shtool} subst \
  --e 's;\(pluginsdir = \)$(DESTDIR)\($(prefix)\);\1\2;' \
  +-e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
   scribus/libpostscript/Makefile.in \
   scribus/libpdf/Makefile.in
   %{l_shtool} subst \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Michael Schloh
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 12:13:57
  Branch: HEAD Handle: 2004072711135700

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

  Log:
modifying package: perl-gd-5.8.5 20040723 -> 20040727

  Summary:
RevisionChanges Path
1.78+2  -2  openpkg-src/perl-gd/perl-gd.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-gd/perl-gd.spec
  
  $ cvs diff -u -r1.77 -r1.78 perl-gd.spec
  --- openpkg-src/perl-gd/perl-gd.spec  23 Jul 2004 20:08:04 -  1.77
  +++ openpkg-src/perl-gd/perl-gd.spec  27 Jul 2004 10:13:57 -  1.78
  @@ -25,7 +25,7 @@
   
   #   versions of individual parts
   %define   V_perl   5.8.5
  -%define   V_gd 2.15
  +%define   V_gd 2.16
   %define   V_gdtextutil 0.86
   %define   V_gdbarcode  1.15
   %define   V_gdgraph1.43
  @@ -47,7 +47,7 @@
   Group:Language
   License:  GPL/Artistic
   Version:  %{V_perl}
  -Release:  20040723
  +Release:  20040727
   
   #   list of sources
   Source0:  http://www.cpan.org/modules/by-module/GD/GD-%{V_gd}.tar.gz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


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

2004-07-27 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 12:12:10
  Branch: OPENPKG_2_1_SOLIDHandle: 2004072711120900

  Added files:  (Branch: OPENPKG_2_1_SOLID)
openpkg-src/apache  apache.patch.php
  Modified files:   (Branch: OPENPKG_2_1_SOLID)
openpkg-src/apache  apache.patch apache.spec

  Log:
MFC: latest fixes from CURRENT for PHP and Expat

  Summary:
RevisionChanges Path
1.13.2.2+13 -4  openpkg-src/apache/apache.patch
1.2.4.1 +62 -0  openpkg-src/apache/apache.patch.php
1.241.2.6   +3  -1  openpkg-src/apache/apache.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.patch
  
  $ cvs diff -u -r1.13.2.1 -r1.13.2.2 apache.patch
  --- openpkg-src/apache/apache.patch   7 Jul 2004 13:47:36 -   1.13.2.1
  +++ openpkg-src/apache/apache.patch   27 Jul 2004 10:12:09 -  1.13.2.2
  @@ -79,10 +79,19 @@

}
   
  -Index: Configure
   apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200
  -+++ apache_1.3.31/src/Configure  2004-07-06 22:05:44 +0200
  -@@ -1869,19 +1875,8 @@
  +Index: apache_1.3.31/src/Configure
  +--- apache_1.3.31/src/Configure.orig 2004-07-26 14:20:53 +0200
   apache_1.3.31/src/Configure  2004-07-26 14:41:24 +0200
  +@@ -1867,27 +1867,12 @@
  + # set the default, based on whether expat-lite is bundled. if it is present,
  + # then we can always include expat.
  + if [ "x$RULE_EXPAT" = "xdefault" ]; then
  +-if [ -d ./lib/expat-lite/ ]; then
  +-RULE_EXPAT=yes
  +-else
  +-RULE_EXPAT=no
  +-fi
  ++RULE_EXPAT=no
fi

if [ "x$RULE_EXPAT" = "xyes" ]; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.patch.php
  
  $ cvs diff -u -r0 -r1.2.4.1 apache.patch.php
  --- /dev/null 2004-07-27 12:12:10 +0200
  +++ apache.patch.php  2004-07-27 12:12:10 +0200
  @@ -0,0 +1,62 @@
  +Index: ext/pdf/pdf.c
  +--- ext/pdf/pdf.c.orig   2004-02-28 23:58:56 +0100
   ext/pdf/pdf.c2004-07-25 11:35:57 +0200
  +@@ -240,6 +240,16 @@
  + ZEND_GET_MODULE(pdf)
  + #endif
  + 
  ++ZEND_BEGIN_MODULE_GLOBALS(pdf)
  ++FILE *fp;
  ++ZEND_END_MODULE_GLOBALS(pdf)
  ++ZEND_DECLARE_MODULE_GLOBALS(pdf)
  ++#ifdef ZTS
  ++#define PDF_G(v) TSRMG(pdf_globals_id, zend_pdf_globals *, v)
  ++#else
  ++#define PDF_G(v) (pdf_globals.v)
  ++#endif
  ++
  + /* {{{ _free_pdf_doc
  +  */
  + static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
  +@@ -305,6 +315,15 @@
  + }
  + /* }}} */
  + 
  ++/* {{{ pdf_flushwrite_fp
  ++ */
  ++static size_t pdf_flushwrite_fp(PDF *p, void *data, size_t size)
  ++{
  ++FILE *fp = PDF_G(fp);
  ++return fwrite(data, size, 1, fp);
  ++}
  ++/* }}} */
  ++
  + /* {{{ pdf_flushwrite
  +  */
  + static size_t pdf_flushwrite(PDF *p, void *data, size_t size)
  +@@ -339,8 +358,13 @@
  + 
  + /* {{{ PHP_MINIT_FUNCTION
  +  */
  ++static void php_pdf_init_globals (zend_pdf_globals *g)
  ++{
  ++g->fp = NULL;
  ++}
  + PHP_MINIT_FUNCTION(pdf)
  + {
  ++ZEND_INIT_MODULE_GLOBALS(pdf, php_pdf_init_globals, NULL);
  + if ((PDF_get_majorversion() != PDFLIB_MAJORVERSION) ||
  + (PDF_get_minorversion() != PDFLIB_MINORVERSION)) {
  + php_error(E_ERROR,"PDFlib error: Version mismatch in wrapper code");
  +@@ -469,9 +493,8 @@
  + pdf = PDF_new2(custom_errorhandler, pdf_emalloc, pdf_realloc, pdf_efree, NULL);
  + 
  + if(fp) {
  +-if (PDF_open_fp(pdf, fp) < 0) {
  +-RETURN_FALSE;
  +-}
  ++PDF_G(fp) = fp;
  ++PDF_begin_document_callback(pdf, pdf_flushwrite_fp, "");
  + } else {
  + PDF_open_mem(pdf, pdf_flushwrite);
  + }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  
  $ cvs diff -u -r1.241.2.5 -r1.241.2.6 apache.spec
  --- openpkg-src/apache/apache.spec16 Jul 2004 09:56:46 -  1.241.2.5
  +++ openpkg-src/apache/apache.spec27 Jul 2004 10:12:09 -  1.241.2.6
  @@ -66,7 +66,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  2.1.1
  +Release:  2.1.2
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -212,6 +212,7 @@
   Patch1:   apache.patch.modowa
   Patch2:   
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.p

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

2004-07-27 Thread Torsten Homeyer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   27-Jul-2004 09:38:15
  Branch: HEAD Handle: 2004072708381400

  Modified files:
openpkg-src/mplayer mplayer.spec
  Removed files:
openpkg-src/mplayer mplayer.patch

  Log:
upgrading package: mplayer 1.0pre4 -> 1.0pre5

  Summary:
RevisionChanges Path
1.11+0  -32 openpkg-src/mplayer/mplayer.patch
1.81+2  -4  openpkg-src/mplayer/mplayer.spec
  

  rm -f openpkg-src/mplayer/mplayer.patch <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.patch
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.spec
  
  $ cvs diff -u -r1.80 -r1.81 mplayer.spec
  --- openpkg-src/mplayer/mplayer.spec  2 Jun 2004 19:06:10 -   1.80
  +++ openpkg-src/mplayer/mplayer.spec  27 Jul 2004 07:38:14 -  1.81
  @@ -24,7 +24,7 @@
   ##
   
   #   package versions
  -%define   V_mplayer 1.0pre4
  +%define   V_mplayer 1.0pre5
   %define   V_blue1.4
   %define   V_live2004.02.20a
   
  @@ -39,7 +39,7 @@
   Group:Video
   License:  GPL and others
   Version:  %{V_mplayer}
  -Release:  20040602
  +Release:  20040727
   
   #   build options
   %option   with_guino
  @@ -52,7 +52,6 @@
   Source3:  ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/qt5dlls.tar.bz2
   Source4:  ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
   Source5:  http://www.live.com/liveMedia/public/live.%{V_live}.tar.gz
  -Patch0:   mplayer.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -97,7 +96,6 @@
   %prep
   %setup -q -n MPlayer-%{V_mplayer}
   %setup -q -n MPlayer-%{V_mplayer} -T -D -a 5
  -%patch -p0
   %{l_shtool} subst \
   -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
   drivers/radeon/radeonfb.c \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]