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 openpkg$ Date: 17-Dec-2003 09:31:16
Branch: HEAD Handle: 2003121708310608
Added files:
openpkg-src/jabberd jabberd.patch
Modified files:
openpkg-re/vcheck vc.jabberd
openpkg-src/jabberd jabberd.spec
openpkg-web news.txt
Log:
upgrading package: jabberd 1.4.2 -> 1.4.3
Summary:
Revision Changes Path
1.3 +4 -2 openpkg-re/vcheck/vc.jabberd
1.1 +37 -0 openpkg-src/jabberd/jabberd.patch
1.15 +10 -10 openpkg-src/jabberd/jabberd.spec
1.7787 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.jabberd
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.jabberd
--- openpkg-re/vcheck/vc.jabberd 1 Aug 2003 08:06:46 -0000 1.2
+++ openpkg-re/vcheck/vc.jabberd 17 Dec 2003 08:31:06 -0000 1.3
@@ -1,9 +1,11 @@
config = {
+ lastcheck = "2003-12-17 09:23"
}
prog jabberd:jabber = {
- version = 1.4.2
+ version = 1.4.3
+ lastcheck = "2003-12-17 09:23"
url = http://jabberd.jabberstudio.org/1.4/
- regex = jabber-(__VER__)\.tar\.gz
+ regex = jabberd-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r0 -r1.1 jabberd.patch
--- /dev/null 2003-12-17 09:31:14.000000000 +0100
+++ jabberd.patch 2003-12-17 09:31:14.000000000 +0100
@@ -0,0 +1,37 @@
+Index: jabberd/jabberd.h
+--- jabberd/jabberd.h.orig 2003-11-13 12:22:42.000000000 +0100
++++ jabberd/jabberd.h 2003-12-17 09:29:41.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include "lib/lib.h"
+ #include <pth.h>
+ #ifdef HAVE_SSL
+-#include <ssl.h>
++#include <openssl/ssl.h>
+ #endif /* HAVE_SSL */
+
+ #define VERSION "1.4.3"
+Index: jabberd/mio_ssl.c
+--- jabberd/mio_ssl.c.orig 2003-11-08 01:09:50.000000000 +0100
++++ jabberd/mio_ssl.c 2003-12-17 09:29:28.000000000 +0100
+@@ -1,6 +1,6 @@
+ #include "jabberd.h"
+ #ifdef HAVE_SSL
+-#include <err.h>
++#include <openssl/err.h>
+
+ HASHTABLE ssl__ctxs;
+ extern int mio__errno;
+Index: jsm/modules/mod_auth_crypt.c
+--- jsm/modules/mod_auth_crypt.c.orig 2003-10-27 20:16:50.000000000 +0100
++++ jsm/modules/mod_auth_crypt.c 2003-12-17 09:28:50.000000000 +0100
+@@ -28,7 +28,9 @@
+ *
+ * --------------------------------------------------------------------------*/
+ #include "jsm.h"
+-#include "crypt.h"
++#ifndef __FreeBSD__
++#include <crypt.h>
++#endif
+
+ #define HASH_CRYPT 1
+ #define HASH_SHA1 2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 27 Nov 2003 13:55:22 -0000 1.14
+++ openpkg-src/jabberd/jabberd.spec 17 Dec 2003 08:31:14 -0000 1.15
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_major 1.4
+%define V_minor 3
+
# package information
Name: jabberd
Summary: Jabber Daemon
@@ -32,12 +36,13 @@
Distribution: OpenPKG [EVAL]
Group: Network
License: JOSL/GPL
-Version: 1.4.2
-Release: 20031127
+Version: %{V_major}.%{V_minor}
+Release: 20031217
# list of sources
-Source0: http://jabberd.jabberstudio.org/downloads/jabber-%{version}.tar.gz
+Source0:
http://jabberd.jabberstudio.org/%{V_major}/dist/jabberd-%{version}.tar.gz
Source1: rc.jabberd
+Patch0: jabberd.patch
# build information
Prefix: %{l_prefix}
@@ -54,17 +59,12 @@
messaging platform.
%prep
- %setup -q -n jabber-%{version}
+ %setup -q
+ %patch -p0
%{l_shtool} subst \
-e 's;^\(JHOME=`pwd`\);#\1;' \
-e 's;\(-I\$ssldir/include\)/openssl;\1;' \
configure
- %{l_shtool} subst \
- -e 's;<ssl\.h>;<openssl/ssl.h>;' \
- jabberd/jabberd.h
- %{l_shtool} subst \
- -e 's;<err\.h>;<openssl/err.h>;' \
- jabberd/mio_ssl.c
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7786 -r1.7787 news.txt
--- openpkg-web/news.txt 17 Dec 2003 08:11:59 -0000 1.7786
+++ openpkg-web/news.txt 17 Dec 2003 08:31:10 -0000 1.7787
@@ -1,3 +1,4 @@
+17-Dec-2003: Upgraded package: P<jabberd-1.4.3-20031217>
17-Dec-2003: Upgraded package: P<autoconf-2.59-20031217>
16-Dec-2003: Upgraded package: P<siege-2.58-20031216>
16-Dec-2003: Upgraded package: P<mysqlcc-0.9.4-20031216>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
