rpms/slrn/devel slrn-0.9.8.1pl1-nss.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 slrn.spec, 1.30, 1.31 sources, 1.9, 1.10
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Fri Aug 24 12:08:54 UTC 2007
Author: mlichvar
Update of /cvs/pkgs/rpms/slrn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035
Modified Files:
.cvsignore slrn.spec sources
Added Files:
slrn-0.9.8.1pl1-nss.patch
Log Message:
- update license tag
- update from CVS
- switch from OpenSSL to NSS
slrn-0.9.8.1pl1-nss.patch:
--- NEW FILE slrn-0.9.8.1pl1-nss.patch ---
--- slrn-0.9.8.1pl1/configure.in.nss 2007-08-24 13:31:18.000000000 +0200
+++ slrn-0.9.8.1pl1/configure.in 2007-08-24 13:31:18.000000000 +0200
@@ -61,6 +61,7 @@ CF_PATH_SLANG_LIB
CF_PATH_SLANG_INC
CF_SSL(OpenSSL,ssl)
CF_SSL([GNU TLS],gnutls)
+CF_SSL(NSS,nss)
CF_MTA
AH_VERBATIM([SLRN_HAS_UUDEVIEW],
[/* define if you want uudeview support */
@@ -390,12 +391,17 @@ AH_BOTTOM(
#if SLRN_HAS_SSL_SUPPORT == 1
#define SLTCP_HAS_SSL_SUPPORT SLRN_HAS_SSL_SUPPORT
#else
+ #if SLRN_HAS_NSS_SUPPORT == 1
+ #define SLTCP_HAS_SSL_SUPPORT SLRN_HAS_NSS_SUPPORT
+ #define SLTCP_HAS_NSS_SUPPORT SLRN_HAS_NSS_SUPPORT
+ #else
#if SLRN_HAS_GNUTLS_SUPPORT == 1
#define SLTCP_HAS_SSL_SUPPORT SLRN_HAS_GNUTLS_SUPPORT
#define SLTCP_HAS_GNUTLS_SUPPORT SLRN_HAS_GNUTLS_SUPPORT
#else
#define SLTCP_HAS_SSL_SUPPORT 0
#endif
+ #endif
#endif
#define SLRN_SERVER_ID_NNTP 1
--- slrn-0.9.8.1pl1/src/sltcp.c.nss 2007-08-24 13:31:18.000000000 +0200
+++ slrn-0.9.8.1pl1/src/sltcp.c 2007-08-24 13:59:11.000000000 +0200
@@ -112,10 +112,14 @@ extern int h_errno;
#if SLTCP_HAS_GNUTLS_SUPPORT
# 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_SUPPORT
+# include <nss_compat_ossl.h>
+# else
+# if SLTCP_HAS_SSL_SUPPORT
+# include <openssl/ssl.h>
+# include <openssl/err.h>
+# include <openssl/rand.h>
+# endif
# endif
#endif
@@ -487,14 +491,17 @@ static void dump_ssl_error_0 (void)
slrn_error ("%s\n", ERR_error_string(err, 0));
}
+#if !SLTCP_HAS_NSS_SUPPORT
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_SUPPORT
time_t t;
pid_t pid;
unsigned int count;
@@ -516,6 +523,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.8.1pl1/autoconf/acinclude.m4.nss 2004-10-05 16:06:08.000000000 +0200
+++ slrn-0.9.8.1pl1/autoconf/acinclude.m4 2007-08-24 13:31:18.000000000 +0200
@@ -320,6 +320,9 @@ AC_DEFUN([CF_SSL],
AH_VERBATIM([SLRN_HAS_SSL_SUPPORT],
[/* define if you want SSL support using OpenSSL */
#define SLRN_HAS_SSL_SUPPORT 0])
+ AH_VERBATIM([SLRN_HAS_NSS_SUPPORT],
+[/* define if you want SSL support using NSS */
+#define SLRN_HAS_NSS_SUPPORT 0])
AH_VERBATIM([SLRN_HAS_GNUTLS_SUPPORT],
[/* define if you want SSL support using GNU TLS */
#define SLRN_HAS_GNUTLS_SUPPORT 0])
@@ -368,9 +371,13 @@ AC_DEFUN([CF_SSL],
ssl_library_dirs="$ac_ssl_home $ac_ssl_home/lib $ssl_library_dirs"
fi
+ ssl_lib=$2
+ if test "x$ssl_lib" = xnss; then
+ ssl_lib=nss_compat_osasl
+ fi
for ssl_dir in $ssl_library_dirs; do
- if test -r "$ssl_dir/lib$2.a" || \
- test -r "$ssl_dir/lib$2.so" ; then
+ if test -r "$ssl_dir/lib$ssl_lib.a" || \
+ test -r "$ssl_dir/lib$ssl_lib.so" ; then
ac_ssl_library="$ssl_dir"
break
fi
@@ -384,50 +391,80 @@ AC_DEFUN([CF_SSL],
AC_MSG_RESULT([$ac_ssl_library])
if test "x$ac_ssl_library" = xno || test "x$ac_ssl_library" = xyes; then
- if test "$1" = OpenSSL ; then
- AC_MSG_ERROR([
+ case "$1" in
+ OpenSSL)
+ AC_MSG_ERROR([
Please install the OpenSSL library. If you already did so, point this script
to the right directory with the --with-ssl-library=DIR option.
])
- else
- AC_MSG_ERROR([
+ ;;
+ NSS)
+ AC_MSG_ERROR([
+
+Please install the nss_compat_ossl library. If you already did so, point this script
+to the right directory with the --with-nss-library=DIR option.
+])
+ ;;
+ *)
+ AC_MSG_ERROR([
Please install the GNU TLS library. If you already did so, point this script
to the right directory with the --with-gnutls-library=DIR option.
])
- fi
+ ;;
+ esac
fi
# gcc under solaris is often not installed correctly. Avoid specifying
# -L/usr/lib.
- if test "$1" = OpenSSL ; then
- if test "x$ac_ssl_library" = "x/usr/lib" ; then
- SSLLIB="-lssl -lcrypto"
- else
- if test "x$enable_hardcode_libs" = "xyes" ; then
- SSLLIB="-L$ac_ssl_library $cf_rpath_option$ac_ssl_library -lssl -lcrypto"
+ case "$1" in
+ OpenSSL)
+ if test "x$ac_ssl_library" = "x/usr/lib" ; then
+ SSLLIB="-lssl -lcrypto"
else
- SSLLIB="-L$ac_ssl_library -lssl -lcrypto"
+ if test "x$enable_hardcode_libs" = "xyes" ; then
+ SSLLIB="-L$ac_ssl_library $cf_rpath_option$ac_ssl_library -lssl -lcrypto"
+ else
+ SSLLIB="-L$ac_ssl_library -lssl -lcrypto"
+ fi
fi
- fi
- else
- if test "x$ac_ssl_library" = "x/usr/lib" ; then
- SSLLIB="-lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
- else
- if test "x$enable_hardcode_libs" = "xyes" ; then
- SSLLIB="-L$ac_ssl_library $cf_rpath_option$ac_ssl_library -lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
+ ;;
+ NSS)
+ if test "x$ac_ssl_library" = "x/usr/lib" ; then
+ SSLLIB="-lnss_compat_ossl"
else
- SSLLIB="-L$ac_ssl_library -lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
+ if test "x$enable_hardcode_libs" = "xyes" ; then
+ SSLLIB="-L$ac_ssl_library $cf_rpath_option$ac_ssl_library -lnss_compat_ossl"
+ else
+ SSLLIB="-L$ac_ssl_library -lnss_compat_ossl"
+ fi
fi
- fi
- fi
+ ;;
+ *)
+ if test "x$ac_ssl_library" = "x/usr/lib" ; then
+ SSLLIB="-lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
+ else
+ if test "x$enable_hardcode_libs" = "xyes" ; then
+ SSLLIB="-L$ac_ssl_library $cf_rpath_option$ac_ssl_library -lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
+ else
+ SSLLIB="-L$ac_ssl_library -lgnutls-extra -lgnutls -ltasn1 -lgcrypt -lgnutls-openssl"
+ fi
+ fi
+ ;;
+ esac
- if test "$1" = OpenSSL ; then
- AC_MSG_CHECKING(for the OpenSSL includes)
- else
- AC_MSG_CHECKING(for the GNU TLS OpenSSL compatibility includes)
- fi
+ case "$1" in
+ OpenSSL)
+ AC_MSG_CHECKING(for the OpenSSL includes)
+ ;;
+ NSS)
+ AC_MSG_CHECKING(for the NSS includes)
+ ;;
+ *)
+ AC_MSG_CHECKING(for the GNU TLS OpenSSL compatibility includes)
+ ;;
+ esac
if test "x$ac_ssl_includes" = xno || test "x$ac_ssl_includes" = xyes ; then
@@ -450,11 +487,14 @@ to the right directory with the --with-g
ssl_include_dirs="$ac_ssl_home $ac_ssl_home/include $ssl_include_dirs"
fi
- if test "$1" = OpenSSL ; then
- ssl_file="openssl/ssl.h"
- else
- ssl_file="gnutls/openssl.h"
- fi
+ case "$1" in
+ OpenSSL)
+ ssl_file="openssl/ssl.h";;
+ NSS)
+ ssl_file="nss_compat_ossl/nss_compat_ossl.h";;
+ *)
+ ssl_file="gnutls/openssl.h";;
+ esac
for ssl_dir in $ssl_include_dirs; do
if test -r "$ssl_dir/$ssl_file"; then
@@ -471,42 +511,68 @@ to the right directory with the --with-g
AC_MSG_RESULT([$ac_ssl_includes])
if test "x$ac_ssl_includes" = xno || test "x$ac_ssl_includes" = xyes; then
- if test "$1" = OpenSSL ; then
- AC_MSG_ERROR([
-
-Please install the OpenSSL header files. If you already did so, point this
-script to the right directory with the --with-ssl-includes=DIR option.
-])
- else
- AC_MSG_ERROR([
-
-Please install the GNU TLS header files. If you already did so, point this
-script to the right directory with the --with-ssl-includes=DIR option.
-])
- fi
- fi
-
- # gcc under solaris is often not installed correctly. Avoid specifying
- # -I/usr/include.
- if test "x$ac_ssl_includes" = "x/usr/include" ; then
- SSLINC=""
- else
- SSLINC="-I$ac_ssl_includes"
+ case "$1" in
+ OpenSSL)
+ AC_MSG_ERROR([
+
+ Please install the OpenSSL header files. If you already did so, point this
+ script to the right directory with the --with-ssl-includes=DIR option.
+ ])
+ ;;
+ NSS)
+ AC_MSG_ERROR([
+
+ Please install the NSS header files. If you already did so, point this
+ script to the right directory with the --with-nss-includes=DIR option.
+ ])
+ ;;
+ *)
+ AC_MSG_ERROR([
+
+ Please install the GNU TLS header files. If you already did so, point this
+ script to the right directory with the --with-gnutls-includes=DIR option.
+ ])
+ ;;
+ esac
+ fi
+
+ if test "$1" = NSS ; then
+ SSLINC="-I$ac_ssl_includes/nss_compat_ossl -I$ac_ssl_includes/nss3 -I$ac_ssl_includes/nspr4"
+ else
+ # gcc under solaris is often not installed correctly. Avoid specifying
+ # -I/usr/include.
+ if test "x$ac_ssl_includes" = "x/usr/include" ; then
+ SSLINC=""
+ else
+ SSLINC="-I$ac_ssl_includes"
+ fi
fi
- if test "$1" = OpenSSL ; then
- AC_DEFINE(SLRN_HAS_SSL_SUPPORT, 1)
- else
- AC_DEFINE(SLRN_HAS_GNUTLS_SUPPORT, 1)
- fi
+ case "$1" in
+ OpenSSL)
+ AC_DEFINE(SLRN_HAS_SSL_SUPPORT, 1)
+ ;;
+ NSS)
+ AC_DEFINE(SLRN_HAS_NSS_SUPPORT, 1)
+ ;;
+ *)
+ AC_DEFINE(SLRN_HAS_GNUTLS_SUPPORT, 1)
+ ;;
+ esac
AC_SUBST(SSLINC)
AC_SUBST(SSLLIB)
else
- if test "$1" = OpenSSL ; then
- AC_DEFINE(SLRN_HAS_SSL_SUPPORT, 0)
- else
- AC_DEFINE(SLRN_HAS_GNUTLS_SUPPORT, 0)
- fi
+ case "$1" in
+ OpenSSL)
+ AC_DEFINE(SLRN_HAS_SSL_SUPPORT, 0)
+ ;;
+ NSS)
+ AC_DEFINE(SLRN_HAS_NSS_SUPPORT, 0)
+ ;;
+ *)
+ AC_DEFINE(SLRN_HAS_GNUTLS_SUPPORT, 0)
+ ;;
+ esac
fi
])
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 26 Nov 2005 14:42:41 -0000 1.9
+++ .cvsignore 24 Aug 2007 12:08:20 -0000 1.10
@@ -2,3 +2,4 @@
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
Index: slrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- slrn.spec 22 Feb 2007 16:58:52 -0000 1.30
+++ slrn.spec 24 Aug 2007 12:08:20 -0000 1.31
@@ -1,8 +1,8 @@
Summary: A threaded Internet news reader
Name: slrn
Version: 0.9.8.1pl1
-Release: 2%{?dist}
-License: GPL
+Release: 3.20070716cvs%{?dist}
+License: GPLv2+
Group: Applications/Internet
Source0: slrn-%{version}.tar.bz2
Source1: slrnpull-expire
@@ -11,7 +11,10 @@
Patch0: slrn-0.9.8.0-config.patch
Patch1: slrn-scorefile.patch
Patch2: slrn-0.9.8.1pl1-asearch.patch
-BuildRequires: slang-devel openssl-devel /usr/sbin/sendmail
+Patch3: slrn-0.9.8.1pl1-20070716cvs.patch.bz2
+Patch4: slrn-0.9.8.1pl1-nss.patch
+BuildRequires: automake autoconf gettext-devel
+BuildRequires: nss-devel nss_compat_ossl-devel slang-devel /usr/sbin/sendmail
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://slrn.sourceforge.net/
@@ -37,10 +40,13 @@
%patch0 -p1 -b .config
%patch1 -p1 -b .scorefile
%patch2 -p1 -b .asearch
+%patch3 -p1
+%patch4 -p1 -b .nss
%build
-%configure --with-ssl --with-slrnpull \
- --with-ssl-includes=%{_includedir} --with-ssl-library=%{_libdir} \
+sh ./autogen.sh -V
+%configure --with-nss --with-slrnpull \
+ --with-nss-includes=%{_includedir} --with-nss-library=%{_libdir} \
--enable-setgid-code
make %{?_smp_mflags}
@@ -91,6 +97,11 @@
%{_mandir}/man1/slrnpull.1*
%changelog
+* Fri Aug 24 2007 Miroslav Lichvar <mlichvar at redhat.com> 0.9.8.1pl1-3.20070716cvs
+- update license tag
+- update from CVS
+- switch from OpenSSL to NSS
+
* Thu Feb 22 2007 Miroslav Lichvar <mlichvar at redhat.com> 0.9.8.1pl1-2
- fix author search (#229597)
- spec cleanup
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 26 Nov 2005 14:42:41 -0000 1.9
+++ sources 24 Aug 2007 12:08:20 -0000 1.10
@@ -1 +1,2 @@
1fe15c359f671d4ab038b7f2ed7507e0 slrn-0.9.8.1pl1.tar.bz2
+cf0f269fe527470d917d7a5cea34b00a slrn-0.9.8.1pl1-20070716cvs.patch.bz2
More information about the fedora-extras-commits
mailing list