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 openpkg-web Date: 25-Jul-2003 11:18:42
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072510183605
Added files: (Branch: OPENPKG_1_STABLE)
openpkg-src/gd gd.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/bind bind.spec
openpkg-src/delegate delegate.spec
openpkg-src/gd gd.spec
openpkg-src/php php.spec
openpkg-src/smtpfeed smtpfeed.spec
openpkg-src/vim vim.spec
openpkg-src/zebra rc.zebra zebra.patch zebra.spec
Log:
MFC: all changes since last merge point
Summary:
Revision Changes Path
1.37.2.5 +3 -2 openpkg-src/bind/bind.spec
1.40.2.4 +2 -2 openpkg-src/delegate/delegate.spec
1.1.2.1 +72 -0 openpkg-src/gd/gd.patch
1.44.2.3 +3 -1 openpkg-src/gd/gd.spec
1.34.2.3 +18 -5 openpkg-src/php/php.spec
1.36.2.5 +4 -1 openpkg-src/smtpfeed/smtpfeed.spec
1.151.2.3 +12 -2 openpkg-src/vim/vim.spec
1.3.4.2 +14 -2 openpkg-src/zebra/rc.zebra
1.3.2.2 +35 -0 openpkg-src/zebra/zebra.patch
1.27.2.3 +1 -1 openpkg-src/zebra/zebra.spec
1.5803 +7 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bind/bind.spec
============================================================================
$ cvs diff -u -r1.37.2.4 -r1.37.2.5 bind.spec
--- openpkg-src/bind/bind.spec 24 Jul 2003 20:43:53 -0000 1.37.2.4
+++ openpkg-src/bind/bind.spec 25 Jul 2003 09:18:37 -0000 1.37.2.5
@@ -37,7 +37,7 @@
Group: DNS
License: ISC
Version: %{V_bind}
-Release: 1.20030724
+Release: 1.20030725
# package options
%option with_dlz_mysql no
@@ -108,7 +108,8 @@
# fix up DLZ link libraries for MySQL and PostgreSQL
%{l_shtool} subst \
-e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|"\);\2;g' \
- -e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
+ -e 's;\(-lpq\);\1 -lssl -lcrypto -lcrypt;g' \
+ -e 's;\(\$use_dlz_postgres/include\);\1/postgresql;g' \
configure
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/delegate.spec
============================================================================
$ cvs diff -u -r1.40.2.3 -r1.40.2.4 delegate.spec
--- openpkg-src/delegate/delegate.spec 24 Jul 2003 20:43:59 -0000
1.40.2.3
+++ openpkg-src/delegate/delegate.spec 25 Jul 2003 09:18:38 -0000
1.40.2.4
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: Network
License: GPL
-Version: 8.5.7
-Release: 1.20030724
+Version: 8.5.8
+Release: 1.20030725
# list of sources
Source0: ftp://ftp:[EMAIL PROTECTED]/pub/DeleGate/delegate%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 gd.patch
--- /dev/null 2003-07-25 11:18:39.000000000 +0200
+++ gd.patch 2003-07-25 11:18:39.000000000 +0200
@@ -0,0 +1,72 @@
+--- gdkanji.c.dist 2003-07-25 10:05:16.000000000 +0200
++++ gdkanji.c 2003-07-25 10:07:43.000000000 +0200
+@@ -27,29 +27,32 @@
+
+ #ifndef HAVE_ICONV
+ #define ICONV_CONST /**/
+- iconv_t iconv_open (const char *, const char *);
+-size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
+-int iconv_close (iconv_t);
++static iconv_t my_iconv_open (const char *, const char *);
++static size_t my_iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
++static int my_iconv_close (iconv_t);
+
+-iconv_t
+-iconv_open (const char *tocode, const char *fromcode)
++static iconv_t
++my_iconv_open (const char *tocode, const char *fromcode)
+ {
+ return (iconv_t) (-1);
+ }
+
+-size_t
+-iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
++static size_t
++my_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
+ char **outbuf, size_t * outbytesleft)
+ {
+ return 0;
+ }
+
+-int
+-iconv_close (iconv_t cd)
++static int
++my_iconv_close (iconv_t cd)
+ {
+ return 0;
+ }
+-
++#else
++#define my_iconv_open iconv_open
++#define my_iconv iconv
++#define my_iconv_close iconv_close
+ #endif /* !HAVE_ICONV */
+
+ #define LIBNAME "any2eucjp()"
+@@ -377,7 +380,7 @@
+ iconv_t cd;
+ size_t from_len, to_len;
+
+- if ((cd = iconv_open (EUCSTR, code)) == (iconv_t) - 1)
++ if ((cd = my_iconv_open (EUCSTR, code)) == (iconv_t) - 1)
+ {
+ error ("iconv_open() error");
+ #ifdef HAVE_ERRNO_H
+@@ -391,7 +394,7 @@
+ from_len = strlen ((const char *) from) + 1;
+ to_len = BUFSIZ;
+
+- if ((int) (iconv (cd, (char **) &from, &from_len, (char **) &to, &to_len))
++ if ((int) (my_iconv (cd, (char **) &from, &from_len, (char **) &to, &to_len))
+ == -1)
+ {
+ #ifdef HAVE_ERRNO_H
+@@ -408,7 +411,7 @@
+ return;
+ }
+
+- if (iconv_close (cd) != 0)
++ if (my_iconv_close (cd) != 0)
+ {
+ error ("iconv_close() error");
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.spec
============================================================================
$ cvs diff -u -r1.44.2.2 -r1.44.2.3 gd.spec
--- openpkg-src/gd/gd.spec 24 Jul 2003 20:44:07 -0000 1.44.2.2
+++ openpkg-src/gd/gd.spec 25 Jul 2003 09:18:38 -0000 1.44.2.3
@@ -33,10 +33,11 @@
Group: Graphics
License: GPL
Version: 2.0.15
-Release: 1.20030724
+Release: 1.20030725
# list of sources
Source0: http://www.boutell.com/gd/http/gd-%{version}.tar.gz
+Patch0: gd.patch
# build information
Prefix: %{l_prefix}
@@ -56,6 +57,7 @@
%prep
%setup -q
+ %patch -p0
%build
( echo "ac_cv_header_iconv_h=no"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.34.2.2 -r1.34.2.3 php.spec
--- openpkg-src/php/php.spec 24 Jul 2003 20:44:58 -0000 1.34.2.2
+++ openpkg-src/php/php.spec 25 Jul 2003 09:18:39 -0000 1.34.2.3
@@ -33,7 +33,7 @@
Group: Language
License: PHP
Version: 4.3.2
-Release: 1.20030724
+Release: 1.20030725
# package options (analog to apache.spec)
%option with_calendar no
@@ -207,13 +207,26 @@
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
- ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
- export ORACLE_HOME
+%if "%{with_gd}" == "yes"
+ libs="$libs -lpng -lz"
+%endif
+%if "%{with_gettext}" == "yes"
+ libs="$libs -liconv"
%endif
%if "%{with_openldap}" == "yes" && "%{with_openldapsasl}" == "yes"
libs="$libs -lsasl2"
%endif
+%if "%{with_imap}" == "yes"
+ libs="$libs -lssl -lcrypto"
+%endif
+%if "%{with_db}" == "yes"
+ libs="$libs -ldb"
+%endif
+%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
+ ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
+ export ORACLE_HOME
+%endif
+
CC="%{l_cc}" \
CFLAGS="$cflags" \
LDFLAGS="$ldflags" \
@@ -245,7 +258,7 @@
--with-freetype-dir=%{l_prefix} \
%endif
%if "%{with_db}" == "yes"
- --with-db3=%{l_prefix} \
+ --with-db4=%{l_prefix} \
%endif
%if "%{with_debug}" == "yes"
--with-debug=yes \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================================
$ cvs diff -u -r1.36.2.4 -r1.36.2.5 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 24 Jul 2003 20:45:22 -0000
1.36.2.4
+++ openpkg-src/smtpfeed/smtpfeed.spec 25 Jul 2003 09:18:40 -0000
1.36.2.5
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 1.18
-Release: 1.20030724
+Release: 1.20030725
# package options
%option with_fsl yes
@@ -65,6 +65,9 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
+ %{l_shtool} subst \
+ -e 's;5\.8;5.[89];g' \
+ smtpfeed-%{version}/configure
%build
# build SMTPfeed
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.151.2.2 -r1.151.2.3 vim.spec
--- openpkg-src/vim/vim.spec 24 Jul 2003 20:42:07 -0000 1.151.2.2
+++ openpkg-src/vim/vim.spec 25 Jul 2003 09:18:40 -0000 1.151.2.3
@@ -26,7 +26,7 @@
# package versions
%define V_vl 6.2
%define V_vs 62
-%define V_pl 21
+%define V_pl 31
# package information
Name: vim
@@ -38,7 +38,7 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 1.20030724
+Release: 1.20030725
# package options
%option with_x11 no
@@ -74,6 +74,16 @@
Patch19: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.019
Patch20: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.020
Patch21: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.021
+Patch22: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.022
+Patch23: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.023
+Patch24: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.024
+Patch25: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.025
+Patch26: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.026
+Patch27: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.027
+Patch28: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.028
+Patch29: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.029
+Patch30: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.030
+Patch31: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.031
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/rc.zebra
============================================================================
$ cvs diff -u -r1.3.4.1 -r1.3.4.2 rc.zebra
--- openpkg-src/zebra/rc.zebra 24 Jul 2003 20:45:40 -0000 1.3.4.1
+++ openpkg-src/zebra/rc.zebra 25 Jul 2003 09:18:41 -0000 1.3.4.2
@@ -6,6 +6,9 @@
%config
zebra_enable="$openpkg_rc_def"
zebra_protocols="rip ospf bgp"
+ zebra_flags=""
+ zebra_bind="127.0.0.1"
+ zebra_port="2601"
zebra_log_prolog="true"
zebra_log_epilog="true"
zebra_log_numfiles="10"
@@ -28,8 +31,17 @@
%start -u @l_susr@
rcService zebra enable yes || exit 0
rcService zebra active yes && exit 0
+ flags="$zebra_flags"
+ echo $flags | grep -- -A >/dev/null
+ if [ $? -ne 0 -a ".$zebra_bind" != . ]; then
+ flags="$flags -A $zebra_bind"
+ fi
+ echo $flags | grep -- -P >/dev/null
+ if [ $? -ne 0 -a ".$zebra_port" != . ]; then
+ flags="$flags -P $zebra_port"
+ fi
cd @l_prefix@/etc/zebra
- @l_prefix@/sbin/zebra -d
+ @l_prefix@/sbin/zebra -d $flags
for protocol in $zebra_protocols; do
if [ -f @l_prefix@/sbin/${protocol}d ]; then
@l_prefix@/sbin/${protocol}d -d
@@ -62,7 +74,7 @@
# rotate logfile
shtool rotate -f \
-n ${zebra_log_numfiles} -s ${zebra_log_minsize} -d \
- -z ${zebra_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -z ${zebra_log_complevel} -m 640 -o @l_susr@ -g @l_mgrp@ \
-P "${zebra_log_prolog}" \
-E "${zebra_log_epilog} && rc zebra restart" \
@l_prefix@/var/zebra/zebra.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.patch
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 zebra.patch
--- openpkg-src/zebra/zebra.patch 24 Jul 2003 20:45:40 -0000 1.3.2.1
+++ openpkg-src/zebra/zebra.patch 25 Jul 2003 09:18:41 -0000 1.3.2.2
@@ -194,3 +194,38 @@
return 0;
/* Generate a digest for the ospf packet - their digest + our digest. */
+
+On systems which do not HAVE_IPV6 or where configure was run with
+--disable-ipv6 zebra 0.93b ignores the hostname specified with the -A
+option and only recognizes the port specified with the -P option. This
+happens with FreeBSD as mentioned by Mike Tancsa in his posting
+http://marc.theaimsgroup.com/?l=zebra&m=105118701805977 on the zebra
+mailing list but the issue is not limited to this OS. This patch enables
+the specification of hostname on systems which HAVE_GETADDRINFO
+regardless of the IP version. This fixes the problem on FreeBSD and
+possibly other OSs. Tested on FreeBSD 4.8, RedHat 9 and Solaris 9.
+2003-07-24 [EMAIL PROTECTED]
+
+--- lib/vty.c.orig 2002-08-18 16:49:50.000000000 +0200
++++ lib/vty.c 2003-07-24 21:41:24.000000000 +0200
+@@ -1700,7 +1700,7 @@
+ return 0;
+ }
+
+-#if defined(HAVE_IPV6) && !defined(NRL)
++#if (defined(HAVE_IPV6) && !defined(NRL)) || defined (HAVE_GETADDRINFO)
+ void
+ vty_serv_sock_addrinfo (const char *hostname, unsigned short port)
+ {
+@@ -1972,7 +1972,11 @@
+ vty_serv_sock_addrinfo (hostname, port);
+ #endif /* NRL*/
+ #else /* ! HAVE_IPV6 */
++#ifdef HAVE_GETADDRINFO
++ vty_serv_sock_addrinfo (hostname, port);
++#else /* ! HAVE_GETADDRINFO */
+ vty_serv_sock_family (port, AF_INET);
++#endif /* HAVE_GETADDRINFO */
+ #endif /* HAVE_IPV6 */
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.spec
============================================================================
$ cvs diff -u -r1.27.2.2 -r1.27.2.3 zebra.spec
--- openpkg-src/zebra/zebra.spec 24 Jul 2003 20:45:40 -0000 1.27.2.2
+++ openpkg-src/zebra/zebra.spec 25 Jul 2003 09:18:41 -0000 1.27.2.3
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.93b
-Release: 1.20030724
+Release: 1.20030725
# list of sources
Source0: ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5802 -r1.5803 news.txt
--- openpkg-web/news.txt 25 Jul 2003 08:32:34 -0000 1.5802
+++ openpkg-web/news.txt 25 Jul 2003 09:18:36 -0000 1.5803
@@ -1,3 +1,10 @@
+25-Jul-2003: Upgraded package: P<zebra-0.93b-1.20030725>
+25-Jul-2003: Upgraded package: P<vim-6.2.31-1.20030725>
+25-Jul-2003: Upgraded package: P<smtpfeed-1.18-1.20030725>
+25-Jul-2003: Upgraded package: P<php-4.3.2-1.20030725>
+25-Jul-2003: Upgraded package: P<gd-2.0.15-1.20030725>
+25-Jul-2003: Upgraded package: P<delegate-8.5.8-1.20030725>
+25-Jul-2003: Upgraded package: P<bind-9.2.2-1.20030725>
25-Jul-2003: Upgraded package: P<bind-9.2.2-20030725>
25-Jul-2003: Upgraded package: P<libffi-20030724-20030725>
25-Jul-2003: Upgraded package: P<gd-2.0.15-20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
