rpms/kannel/EL-5 gateway-1.4.1-typesh.patch, NONE, 1.1 gateway-1.4.3-ssldetect.patch, NONE, 1.1 gw-config, NONE, 1.1 .cvsignore, 1.4, 1.5 kannel.init, 1.2, 1.3 kannel.spec, 1.13, 1.14 sources, 1.4, 1.5

Sat Sep 12 15:26:36 UTC 2009

Author: thias

Update of /cvs/extras/rpms/kannel/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12373

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Added Files:
	gateway-1.4.1-typesh.patch gateway-1.4.3-ssldetect.patch 
	gw-config 
Log Message:
Backport the devel 1.4.3 update, since it includes some security fixes.


gateway-1.4.1-typesh.patch:
 gw_uuid_types.h.in |   46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

--- NEW FILE gateway-1.4.1-typesh.patch ---
diff -Naupr gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in gateway-1.4.1/gwlib/gw_uuid_types.h.in
--- gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in	2003-12-08 12:25:44.000000000 +0100
+++ gateway-1.4.1/gwlib/gw_uuid_types.h.in	2008-12-22 15:16:18.678371529 +0100
@@ -3,49 +3,7 @@
  * everything we need.  (cross fingers)  Other header files may have 
  * also defined the types that we need.
  */
-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_UUID_TYPES) && !defined(_EXT2_TYPES_H))
-#define _UUID_TYPES_H
-
-typedef unsigned char __u8;
-typedef signed char __s8;
-
-#if (@SIZEOF_INT@ == 8)
-typedef int		__s64;
-typedef unsigned int	__u64;
-#elif (@SIZEOF_LONG@ == 8)
-typedef long		__s64;
-typedef unsigned long	__u64;
-#elif (@SIZEOF_LONG_LONG@ == 8)
-#if defined(__GNUC__)
-typedef __signed__ long long 	__s64;
-#else
-typedef signed long long 	__s64;
-#endif
-typedef unsigned long long	__u64;
-#endif
-
-#if (@SIZEOF_INT@ == 2)
-typedef	int		__s16;
-typedef	unsigned int	__u16;
-#elif (@SIZEOF_SHORT@ == 2)
-typedef	short		__s16;
-typedef	unsigned short	__u16;
-#else
-  ?==error: undefined 16 bit type
-#endif
-
-#if (@SIZEOF_INT@ == 4)
-typedef	int		__s32;
-typedef	unsigned int	__u32;
-#elif (@SIZEOF_LONG@ == 4)
-typedef	long		__s32;
-typedef	unsigned long	__u32;
-#elif (@SIZEOF_SHORT@ == 4)
-typedef	short		__s32;
-typedef	unsigned short	__u32;
-#else
- ?== error: undefined 32 bit type
+#if (!defined(_LINUX_TYPES_H))
+#include <linux/types.h>
 #endif
 
-#endif /* _*_TYPES_H */

gateway-1.4.3-ssldetect.patch:
 configure |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

--- NEW FILE gateway-1.4.3-ssldetect.patch ---
diff -up gateway-1.4.3/configure~ gateway-1.4.3/configure
--- gateway-1.4.3/configure~	2008-08-06 17:22:43.000000000 +0300
+++ gateway-1.4.3/configure	2009-06-25 21:10:01.000000000 +0300
@@ -10957,28 +10957,8 @@ fi
 
 
 if test "$ssl" = "yes" ; then
-    if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/lib64 /usr/local/ssl/lib /usr/local/openssl/lib; do
-      if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
-        ssllib="$loc"
-      fi
-    done
-    for loc in /usr/include/ssl /usr/include/openssl /usr/local/ssl/include \
-               /usr/local/openssl/include; do
-      if test -d "$loc"; then
-        sslinc="$loc"
-      fi
-    done
-  fi
-  { $as_echo "$as_me:$LINENO: result: trying $ssllib $sslinc" >&5
-$as_echo "trying $ssllib $sslinc" >&6; }
-fi
-
-
-
-if test "x$ssllib" != "x" && test "x$sslinc" != "x"; then
-  CFLAGS="$CFLAGS -I$sslinc"
-  LIBS="$LIBS -L$ssllib"
+  CFLAGS="$CFLAGS ${sslinc:+-I$sslinc}${sslinc:-`pkg-config openssl --cflags`}"
+  LIBS="$LIBS ${ssllib:+-L$ssllib}${ssllib:-`pkg-config openssl --libs`}"
 
   # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2


--- NEW FILE gw-config ---
#!/bin/sh
#
# Fedora specific hack in order to have an identical script across all archs
# which won't create multilib conflicts.

# Always prefer 64bit over 32bit, hardcode the multilib archs here
for ARCH in x86_64 ia64 s390; do
    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
done

# No multilib, execute the first one found (there should be only one anyway)
CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)

if [ -x "${CONFIGSCRIPT}" ]; then
    exec ${CONFIGSCRIPT}
else
    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
    exit 1
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
+++ .cvsignore	12 Sep 2009 15:26:34 -0000	1.5
@@ -1 +1 @@
-gateway-1.4.1.tar.bz2
+gateway-1.4.3.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/kannel.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kannel.init	2 Oct 2006 15:25:40 -0000	1.2
+++ kannel.init	12 Sep 2009 15:26:35 -0000	1.3
@@ -6,6 +6,14 @@
 # description:  The Kannel WAP and SMS gateway services
 # config: /etc/kannel.conf
 
+### BEGIN INIT INFO
+# Provides: kannel
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Kannel WAP gateway services
+# Description: Kannel is a set of daemons implementing WAP gateway services.
+### END INIT INFO
+
 # Use start-stop-kannel
 prog="/usr/sbin/start-stop-kannel"
 args="--start --background --chuid kannel:kannel --exec "


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/kannel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kannel.spec	16 Oct 2006 14:38:52 -0000	1.13
+++ kannel.spec	12 Sep 2009 15:26:35 -0000	1.14
@@ -1,23 +1,22 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.1
-Release: 2%{?dist}
-License: Kannel
+Version: 1.4.3
+Release: 3%{?dist}
+License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
 Source0: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
+Source4: gw-config
+# TODO: a corresponding configure.in patch could be upstreamable?
+Patch0: gateway-1.4.3-ssldetect.patch
+Patch1: gateway-1.4.1-typesh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex
+BuildRequires: bison, byacc, flex, ghostscript
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
-# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: sqlite-devel
-%else
-BuildRequires: sqlite2-devel
-%endif
 %{?_with_mysql:Buildrequires: mysql-devel}
 %{?_with_pgsql:Buildrequires: postgresql-devel}
 # For the docs...
@@ -34,9 +33,10 @@ forms. Only the data call bearer (UDP) i
 
 
 %package devel
-Summary: Development files for the kannel WAP and SMS gateway
+Summary: Development files for the Kannel WAP and SMS gateway
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 
 %description devel
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,32 +47,48 @@ files via HTTP works, including compilat
 forms. Only the data call bearer (UDP) is supported, not SMS.
 
 Install this package if you need to develop or recompile applications that
-use the kannel WAP and SMS gateway.
+use the Kannel WAP and SMS gateway.
+
+
+%package docs
+Summary: Documentation for the Kannel WAP and SMS gateway
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description docs
+The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
+implementing keyword based services via GSM text messages, and a WAP gateway,
+via UDP. The SMS part is fairly mature, the WAP part is early in its
+development. In this release, the GET request for WML pages and WMLScript
+files via HTTP works, including compilation for WML and WMLScript to binary
+forms. Only the data call bearer (UDP) is supported, not SMS.
+
+This package contains documentation for the Kannel WAP and SMS gateway.
 
 
 %prep
-%setup -n gateway-%{version}
+%setup -q -n gateway-%{version}
+%patch0 -p1 -b .ssldetect
+%patch1 -p1 -b .typesh
+%{__chmod} -c -x gwlib/html-entities.def # for -debuginfo, as of 1.4.3
 
 
 %build
 %configure \
     --enable-pcre \
-    --enable-docs \
     --enable-start-stop-daemon \
-%if %{!?fedora:6}%{?fedora} >= 6
     --with-sqlite3 \
-%else
-    --with-sqlite \
-%endif
     %{?_with_mysql} \
     %{?_with_pgsql}
-# Remove %{?_smp_mflags} since the docs fail to build with it
+# Remove %{?_smp_mflags} since the docs fail to build with it as of 1.4.3
 %{__make}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 # Install fakesmsc and fakewap, useful for monitoring
 %{__install} -m 0755 test/{fakesmsc,fakewap} %{buildroot}%{_bindir}/
 # Logrotate entry
@@ -86,6 +102,12 @@ use the kannel WAP and SMS gateway.
 # Rename start-stop-daemon to start-stop-kannel
 %{__mv} %{buildroot}%{_sbindir}/start-stop-daemon \
         %{buildroot}%{_sbindir}/start-stop-kannel
+# Remove executable bit from man pages (as of 1.4.3)
+%{__chmod} -c -x %{buildroot}%{_mandir}/man?/*
+# Multilib fix : Replace the gw-config with our wrapper script
+%{__mv} %{buildroot}%{_bindir}/gw-config \
+        %{buildroot}%{_bindir}/gw-config.%{_arch}
+%{__install} -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/gw-config
 
 
 %clean
@@ -114,25 +136,77 @@ fi
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
-%attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%attr(0640,kannel,kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
-%config %{_sysconfdir}/rc.d/init.d/kannel
-%{_bindir}/*
+%{_sysconfdir}/rc.d/init.d/kannel
+%{_bindir}/fakesmsc
+%{_bindir}/fakewap
+%{_bindir}/mtbatch
+%{_bindir}/seewbmp
+%{_bindir}/wmlsc
+%{_bindir}/wmlsdasm
 %{_sbindir}/*
 %{_mandir}/man?/*
-%attr(0750, kannel, kannel) %dir %{_var}/log/kannel/
-
+%attr(0750,kannel,kannel) %dir %{_var}/log/kannel/
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
+%{_bindir}/gw-config*
 %{_includedir}/kannel/
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*/*.pdf
+
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-1
+- Update to 1.4.3 (#495891).
+- Provide -static in -devel.
+- Split PDFs into -docs, noarch where applicable.
+- Patch to use pkg-config at build time for SSL detection.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.1-10
+- rebuild with new openssl
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.1-9
+- Include patch to fix openssl detection on 64bit.
+- Include gw-config wrapper script to fix multilib conflicts (#341701).
+- Include patch to remove definitions of types which never happen on Linux.
+- Added "INIT INFO" block to the init script (#246964).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org>
+- Rebuild for deps
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-5
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-4
+- Update License field.
+- Switch to using the DESTDIR install method.
+- No longer mark init script as config file.
+- Remove executable bit from man pages.
+- Move gw-config to devel sub-package.
+
+* Thu Dec 14 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-3
+- Add ghostscript build requirement, needed (at least on) RHEL4.
+
 * Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
 - Make sure we keep sqlite2 support for FC5 and below.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Oct 2006 15:25:40 -0000	1.4
+++ sources	12 Sep 2009 15:26:35 -0000	1.5
@@ -1 +1 @@
-ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2
+c52febb1a58884778bc5f2aa9f10b642  gateway-1.4.3.tar.bz2


