rpms/slrn/devel slrn-0.9.9pre108-gcc.patch, NONE, 1.1 slrn-0.9.9pre108-makefile.patch, NONE, 1.1 slrn-0.9.9pre108-nss.patch, NONE, 1.1 slrn-0.9.9pre108-sendmail.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 slrn.spec, 1.37, 1.38 sources, 1.10, 1.11 slrn-0.9.8.0-config.patch, 1.1, NONE slrn-0.9.8.1pl1-nss.patch, 1.1, NONE slrn-scorefile.patch, 1.2, NONE
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Mon Jun 9 10:39:11 UTC 2008
Author: mlichvar
Update of /cvs/pkgs/rpms/slrn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944
Modified Files:
.cvsignore slrn.spec sources
Added Files:
slrn-0.9.9pre108-gcc.patch slrn-0.9.9pre108-makefile.patch
slrn-0.9.9pre108-nss.patch slrn-0.9.9pre108-sendmail.patch
Removed Files:
slrn-0.9.8.0-config.patch slrn-0.9.8.1pl1-nss.patch
slrn-scorefile.patch
Log Message:
- update to 0.9.9-pre108
- enable inews support
- remove -D_GNU_SOURCE from CFLAGS
slrn-0.9.9pre108-gcc.patch:
--- NEW FILE slrn-0.9.9pre108-gcc.patch ---
diff -up slrn/autoconf/aclocal.m4.gcc slrn/autoconf/aclocal.m4
--- slrn/autoconf/aclocal.m4.gcc 2008-06-02 05:59:39.000000000 +0200
+++ slrn/autoconf/aclocal.m4 2008-06-05 19:07:54.000000000 +0200
@@ -501,11 +501,11 @@ dnl#}}}
AC_DEFUN(JD_ANSI_CC, dnl#{{{
[
+AC_AIX
AC_PROG_CC
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
AC_ISC_POSIX
-AC_AIX
dnl #This stuff came from Yorick config script
dnl
slrn-0.9.9pre108-makefile.patch:
--- NEW FILE slrn-0.9.9pre108-makefile.patch ---
diff -up slrn/src/Makefile.in.makefile slrn/src/Makefile.in
--- slrn/src/Makefile.in.makefile 2008-03-03 20:39:26.000000000 +0100
+++ slrn/src/Makefile.in 2008-06-09 12:32:47.000000000 +0200
@@ -27,7 +27,7 @@ ICONV_LIB = @LIBICONV@ @LIBINTL@
SYSLIBS = @X_EXTRA_LIBS@ @TERMCAP@
#-----------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
#---------------------------------------------------------------------------
# Installation Directories
@@ -204,8 +204,8 @@ installslang:
installlocales:
cd ../po; $(MAKE) DESTDIR=$(DESTDIR) LOCALEDIR=$(LOCALEDIR) install
installbin:
- $(INSTALL) -m 755 -s $(OBJDIR)/slrn $(DEST_BINDIR)
- -$(INSTALL) -m 755 -s $(OBJDIR)/slrnpull $(DEST_BINDIR)
+ $(INSTALL) -m 755 $(OBJDIR)/slrn $(DEST_BINDIR)
+ -$(INSTALL) -m 755 $(OBJDIR)/slrnpull $(DEST_BINDIR)
install: all installdirs installbin installdocs installslang installlocales
# The symlinks target is for my own private use. It simply creates the object
slrn-0.9.9pre108-nss.patch:
--- NEW FILE slrn-0.9.9pre108-nss.patch ---
diff -up slrn/autoconf/configure.ac.nss slrn/autoconf/configure.ac
--- slrn/autoconf/configure.ac.nss 2008-06-02 05:59:39.000000000 +0200
+++ slrn/autoconf/configure.ac 2008-06-06 15:15:15.000000000 +0200
@@ -200,6 +200,9 @@ AC_SUBST(INCICONV)dnl# AM_GNU_GETTEXT do
#---------------------------------------------------------------------------
# SSL stuff
#---------------------------------------------------------------------------
+AC_ARG_WITH(nss-compat,
+ [ --with-nss-compat Use NSS compat library instead of OpenSSL],
+ [use_nss_compat=$withval], [use_nss_compat=no])
AC_CACHE_CHECK(if you want SSL support,jd_use_ssl,
[
AC_ARG_WITH(ssl,
@@ -212,17 +215,30 @@ xno)
SSLLIB=
;;
x|xyes)
- SSLINC="-I/usr/local/ssl/include"
- SSLLIB="-L/usr/local/ssl/lib -lssl -lcrypto"
+ if test "x$use_nss_compat" != xno; then
+ SSLINC="-I/usr/local/include/nss_compat_ossl -I/usr/local/include/nss3 -I/usr/local/include/nspr4"
+ SSLLIB="-L/usr/local/lib -lnss_compat_ossl"
+ else
+ SSLINC="-I/usr/local/ssl/include"
+ SSLLIB="-L/usr/local/ssl/lib -lssl -lcrypto"
+ fi
;;
*)
- SSLINC="-I$jd_use_ssl/include"
- SSLLIB="-L$jd_use_ssl/lib -lssl -lcrypto"
+ if test "x$use_nss_compat" != xno; then
+ SSLINC="-I$jd_use_ssl/include/nss_compat_ossl -I$jd_use_ssl/include/nss3 -I$jd_use_ssl/include/nspr4"
+ SSLLIB="-L$jd_use_ssl/lib -lnss_compat_ossl"
+ else
+ SSLINC="-I$jd_use_ssl/include"
+ SSLLIB="-L$jd_use_ssl/lib -lssl -lcrypto"
+ fi
esac
AC_SUBST(SSLINC)
AC_SUBST(SSLLIB)
if test "x$SSLINC" != x; then
AC_DEFINE(USE_SSL)
+ if test "x$use_nss_compat" != xno; then
+ AC_DEFINE(USE_NSS_COMPAT)
+ fi
fi
#---------------------------------------------------------------------------
diff -up slrn/src/config.hin.nss slrn/src/config.hin
--- slrn/src/config.hin.nss 2008-06-02 05:59:39.000000000 +0200
+++ slrn/src/config.hin 2008-06-06 15:08:57.000000000 +0200
@@ -16,6 +16,9 @@
/* define if you want SSL support */
#undef USE_SSL
+/* define if you want NSS compat support */
+#undef USE_NSS_COMPAT
+
/* define if you have stdlib.h */
#undef HAVE_STDLIB_H
@@ -162,6 +165,9 @@
#define SLTCP_HAS_GNUTLS_SUPPORT SLRN_HAS_GNUTLS_SUPPORT
#define SLTCP_HAS_SSL_SUPPORT SLRN_HAS_SSL_SUPPORT
+#ifdef USE_NSS_COMPAT
+# define SLTCP_HAS_NSS_COMPAT 1
+#endif
#define SLRN_SERVER_ID_NNTP 1
#define SLRN_SERVER_ID_SPOOL 2
diff -up slrn/src/sltcp.c.nss slrn/src/sltcp.c
--- slrn/src/sltcp.c.nss 2007-11-06 05:34:40.000000000 +0100
+++ slrn/src/sltcp.c 2008-06-06 15:08:57.000000000 +0200
@@ -114,9 +114,13 @@ extern int h_errno;
# include <gnutls/openssl.h>
#else
# if SLTCP_HAS_SSL_SUPPORT
-# include <openssl/ssl.h>
-# include <openssl/err.h>
-# include <openssl/rand.h>
+# if SLTCP_HAS_NSS_COMPAT
+# include <nss_compat_ossl.h>
+# else
+# include <openssl/ssl.h>
+# include <openssl/err.h>
+# include <openssl/rand.h>
+# endif
# endif
#endif
@@ -509,14 +513,17 @@ static void dump_ssl_error_0 (void)
print_error ("%s\n", ERR_error_string(err, 0));
}
+#if !SLTCP_HAS_NSS_COMPAT
unsigned long Fast_Random;
static unsigned long fast_random (void)
{
return (Fast_Random = Fast_Random * 69069U + 1013904243U);
}
+#endif
static int init_ssl_random (void)
{
+#if !SLTCP_HAS_NSS_COMPAT
time_t t;
pid_t pid;
unsigned int count;
@@ -538,6 +545,7 @@ static int init_ssl_random (void)
unsigned long r = fast_random ();
RAND_seed (&r, sizeof (unsigned long));
}
+#endif
if (RAND_status ())
return 0;
slrn-0.9.9pre108-sendmail.patch:
--- NEW FILE slrn-0.9.9pre108-sendmail.patch ---
diff -up slrn/src/slrnfeat.hin.sendmail slrn/src/slrnfeat.hin
--- slrn/src/slrnfeat.hin.sendmail 2008-02-09 19:32:17.000000000 +0100
+++ slrn/src/slrnfeat.hin 2008-06-09 11:16:36.000000000 +0200
@@ -179,7 +179,7 @@
# define SLRN_SIGNATURE_FILE ".signature"
/* Changing these here has no effect when using ./configure */
# ifndef SLRN_SENDMAIL_COMMAND
-# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb"
+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb"
# endif
# endif /* unix */
# endif /* os2 */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 24 Aug 2007 12:08:20 -0000 1.10
+++ .cvsignore 9 Jun 2008 10:38:29 -0000 1.11
@@ -1,5 +1 @@
-slrn-0.9.7.4.tar.bz2
-slrn-0.9.8.0.tar.bz2
-slrn-0.9.8.1.tar.bz2
-slrn-0.9.8.1pl1.tar.bz2
-slrn-0.9.8.1pl1-20070716cvs.patch.bz2
+slrn-0.9.9pre108.tar.bz2
Index: slrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- slrn.spec 13 Feb 2008 18:56:02 -0000 1.37
+++ slrn.spec 9 Jun 2008 10:38:29 -0000 1.38
@@ -1,20 +1,23 @@
Summary: A threaded Internet news reader
Name: slrn
-Version: 0.9.8.1pl1
-Release: 8.20070716cvs%{?dist}
+Version: 0.9.9
+Release: 0.1.pre108%{?dist}
License: GPLv2+
Group: Applications/Internet
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# tarball generated by:
+# svn export -r 272 https://slrn.svn.sourceforge.net/svnroot/slrn/trunk slrn
+# tar cjf slrn-0.9.9pre108.tar.bz2 slrn
+Source0: slrn-0.9.9pre108.tar.bz2
Source1: slrnpull-expire
Source2: slrnpull.log
Source4: README.rpm-slrnpull
-Patch0: slrn-0.9.8.0-config.patch
-Patch1: slrn-scorefile.patch
-Patch3: slrn-0.9.8.1pl1-20070716cvs.patch.bz2
-Patch4: slrn-0.9.8.1pl1-nss.patch
+Patch1: slrn-0.9.9pre108-makefile.patch
+Patch2: slrn-0.9.9pre108-sendmail.patch
+Patch3: slrn-0.9.9pre108-gcc.patch
+Patch4: slrn-0.9.9pre108-nss.patch
Patch5: slrn-0.9.8.1pl1-getaddr.patch
-BuildRequires: automake autoconf gettext-devel
-BuildRequires: nss-devel nss_compat_ossl-devel slang-devel /usr/sbin/sendmail
+BuildRequires: autoconf gettext-devel inews
+BuildRequires: nss-devel nss_compat_ossl-devel slang-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://slrn.sourceforge.net/
@@ -36,10 +39,10 @@
the slrnpull utility.
%prep
-%setup -q
-%patch0 -p1 -b .config
-%patch1 -p1 -b .scorefile
-%patch3 -p1
+%setup -q -n slrn
+%patch1 -p1 -b .makefile
+%patch2 -p1 -b .sendmail
+%patch3 -p1 -b .gcc
%patch4 -p1 -b .nss
%patch5 -p1 -b .getaddr
@@ -48,11 +51,15 @@
done
%build
-sh ./autogen.sh -V
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-%configure --with-nss --with-slrnpull \
- --with-nss-includes=%{_includedir} --with-nss-library=%{_libdir} \
- --enable-setgid-code
+autoconf -o configure -I autoconf autoconf/configure.ac
+%configure \
+ --with-slanginc=%{_includedir}/slang \
+ --with-slanglib=%{_libdir} \
+ --with-ssl=%{_prefix} \
+ --with-nss-compat \
+ --with-slrnpull=%{_var}/spool/slrnpull \
+ --enable-inews \
+ --enable-setgid-code
make %{?_smp_mflags}
%install
@@ -102,6 +109,11 @@
%{_mandir}/man1/slrnpull.1*
%changelog
+* Mon Jun 09 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.9.9-0.1.pre108
+- update to 0.9.9-pre108
+- enable inews support
+- remove -D_GNU_SOURCE from CFLAGS
+
* Wed Feb 13 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.9.8.1pl1-8.20070716cvs
- fix building with new glibc headers
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 24 Aug 2007 12:08:20 -0000 1.10
+++ sources 9 Jun 2008 10:38:29 -0000 1.11
@@ -1,2 +1 @@
-1fe15c359f671d4ab038b7f2ed7507e0 slrn-0.9.8.1pl1.tar.bz2
-cf0f269fe527470d917d7a5cea34b00a slrn-0.9.8.1pl1-20070716cvs.patch.bz2
+47635fabe9711079870839d2bfc43026 slrn-0.9.9pre108.tar.bz2
--- slrn-0.9.8.0-config.patch DELETED ---
--- slrn-0.9.8.1pl1-nss.patch DELETED ---
--- slrn-scorefile.patch DELETED ---
More information about the fedora-extras-commits
mailing list