OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 03-May-2009 10:09:59
Branch: HEAD Handle: 2009050309095900
Modified files:
openpkg-src/ctrlproxy ctrlproxy.patch ctrlproxy.spec
Log:
upgrading package: ctrlproxy 3.0.7 -> 3.0.8
Summary:
Revision Changes Path
1.3 +23 -21 openpkg-src/ctrlproxy/ctrlproxy.patch
1.5 +12 -9 openpkg-src/ctrlproxy/ctrlproxy.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ctrlproxy/ctrlproxy.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 ctrlproxy.patch
--- openpkg-src/ctrlproxy/ctrlproxy.patch 15 Jun 2008 07:39:03 -0000
1.2
+++ openpkg-src/ctrlproxy/ctrlproxy.patch 3 May 2009 08:09:59 -0000
1.3
@@ -1,19 +1,23 @@
Index: Makefile
---- Makefile.orig 2008-04-10 18:24:40 +0200
-+++ Makefile 2008-04-14 07:57:01 +0200
-@@ -101,19 +101,19 @@
+--- Makefile.orig 2008-12-06 18:36:33 +0100
++++ Makefile 2009-05-03 10:01:18 +0200
+@@ -103,11 +103,11 @@
linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
-+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
++ @$(LD) $(LIBS) -o $@ $^ $(LIBS)
ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
- ctrlproxyd$(EXEEXT): daemon/main.o $(objs) $(LIBIRC)
+ src/settings.o: CFLAGS+=-DSYSCONFDIR=\"${sysconfdir}\"
+
+@@ -119,11 +119,11 @@
+
+ ctrlproxyd$(EXEEXT): $(daemon_objs) $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -26,12 +30,12 @@
%.o: %.c
@echo Compiling $<
Index: Makefile.settings.in
---- Makefile.settings.in.orig 2008-04-10 18:24:40 +0200
-+++ Makefile.settings.in 2008-04-14 07:56:03 +0200
-@@ -9,12 +9,12 @@
- localedir = @datadir@/locale
+--- Makefile.settings.in.orig 2008-12-06 18:36:33 +0100
++++ Makefile.settings.in 2009-05-03 09:59:50 +0200
+@@ -10,12 +10,12 @@
INSTALL = @INSTALL@
bindir = @bindir@
+ sbindir = @sbindir@
-docdir = @prefix@/share/doc/ctrlproxy
+docdir = @prefix@/share/ctrlproxy
modulesdir = @libdir@/ctrlproxy
@@ -41,20 +45,18 @@
-destincludedir = $(includedir)/ctrlproxy-3.0
+destincludedir = $(includedir)/ctrlproxy
cdatadir = @datadir@/ctrlproxy
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
+ sysconfdir = @sysconfdir@
+ localstatedir = @localstatedir@
Index: src/internals.h
---- src/internals.h.orig 2008-04-10 18:24:41 +0200
-+++ src/internals.h 2008-04-14 07:56:03 +0200
-@@ -28,9 +28,10 @@
+--- src/internals.h.orig 2008-12-06 18:36:33 +0100
++++ src/internals.h 2009-05-03 09:59:50 +0200
+@@ -28,8 +28,8 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-+#include <sys/types.h>
- #include <netdb.h>
-+#include <netinet/in.h>
+-#include <netdb.h>
+ #include <sys/types.h>
++#include <netdb.h>
#include <sys/socket.h>
--#include <sys/types.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ctrlproxy/ctrlproxy.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 ctrlproxy.spec
--- openpkg-src/ctrlproxy/ctrlproxy.spec 18 Apr 2009 13:09:31 -0000
1.4
+++ openpkg-src/ctrlproxy/ctrlproxy.spec 3 May 2009 08:09:59 -0000
1.5
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 3.0.7
-%define V_dist 3.0.7
+%define V_opkg 3.0.8
+%define V_dist 3.0.8
# package information
Name: ctrlproxy
@@ -36,7 +36,7 @@
Group: InstantMessaging
License: GPL
Version: %{V_opkg}
-Release: 20080615
+Release: 20090503
# list of sources
Source0: http://www.ctrlproxy.org/releases/ctrlproxy-%{V_dist}.tar.gz
@@ -47,8 +47,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: glib2, gnutls, readline
-PreReq: glib2, gnutls, readline
+BuildPreReq: glib2, gnutls, libtasn1, readline
+PreReq: glib2, gnutls, libtasn1, readline
AutoReq: no
AutoReqProv: no
@@ -71,12 +71,15 @@
%patch -p0
%build
+ ( echo "ac_cv_path_KRB5_CONFIG=no"
+ ) >config.cache
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} `pkg-config readline glib-2.0
--cflags-only-other`" \
- CPPFLAGS="%{l_cppflags} `pkg-config readline glib-2.0 --cflags-only-I`" \
- LDFLAGS="%{l_ldflags} `pkg-config readline glib-2.0 --libs-only-other`" \
- LIBS="`pkg-config readline glib-2.0 --libs-only-l`" \
+ CFLAGS="%{l_cflags -O} `pkg-config readline glib-2.0 gnutls libtasn1
--cflags-only-other`" \
+ CPPFLAGS="%{l_cppflags} `pkg-config readline glib-2.0 gnutls libtasn1
--cflags-only-I`" \
+ LDFLAGS="%{l_ldflags} `pkg-config readline glib-2.0 gnutls libtasn1
--libs-only-other`" \
+ LIBS="`pkg-config readline glib-2.0 gnutls libtasn1 --libs-only-l`" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
