rpms/nntpgrab/F-9 nntpgrab_use_nss_compat_ossl.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 nntpgrab.spec, 1.16, 1.17 sources, 1.14, 1.15
Erik van Pienbroek
epienbro at fedoraproject.org
Sat Sep 13 18:54:11 UTC 2008
- Previous message (by thread): rpms/nntpgrab/F-8 nntpgrab_use_nss_compat_ossl.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nntpgrab.spec, 1.11, 1.12 sources, 1.10, 1.11
- Next message (by thread): rpms/nntpgrab/devel nntpgrab_use_nss_compat_ossl.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 nntpgrab.spec, 1.17, 1.18 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: epienbro
Update of /cvs/pkgs/rpms/nntpgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095/F-9
Modified Files:
.cvsignore nntpgrab.spec sources
Added Files:
nntpgrab_use_nss_compat_ossl.patch
Log Message:
- Update to 0.3.91
- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
- The .htaccess file was missing in the nntpgrab-web subpackage
- Include %_libdir/nntpgrab directory (for F-8 and F-9, devel was already done)
nntpgrab_use_nss_compat_ossl.patch:
--- NEW FILE nntpgrab_use_nss_compat_ossl.patch ---
Index: plugins/nntp/nntp.c
===================================================================
--- plugins/nntp/nntp.c (revision 1026)
+++ plugins/nntp/nntp.c (working copy)
@@ -35,8 +35,7 @@
#include <netinet/in.h>
#include <netdb.h>
#endif
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#include <nss_compat_ossl/nss_compat_ossl.h>
#ifdef _MSC_VER
#include "config.h.win32"
Index: plugins/nntp/Makefile.am
===================================================================
--- plugins/nntp/Makefile.am (revision 1026)
+++ plugins/nntp/Makefile.am (working copy)
@@ -2,9 +2,9 @@
plugin_LTLIBRARIES = libnntpgrab_plugin_nntp.la
libnntpgrab_plugin_nntp_la_SOURCES = nntp.c
-libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
+libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(NSS_CFLAGS)
libnntpgrab_plugin_nntp_la_LDFLAGS = -module -no-undefined -version-info 0:0:0 -export-symbols ../nntpgrab_plugin_nntp.def
-libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) -lnss_compat_ossl
if WIN32
libnntpgrab_plugin_nntp_la_SOURCES += strptime.c
Index: configure.in
===================================================================
--- configure.in (revision 1029)
+++ configure.in (working copy)
@@ -33,6 +33,7 @@
#PKG_CHECK_MODULES(SQLITE3, sqlite3,,[AC_MSG_ERROR([* SQLite 3.0 of hoger kan niet gevonden worden (is the package sqlite-devel installed?)])])
PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60,have_dbus=true,[AC_MSG_RESULT([* DBUS-Glib 0.60 or higher could not be found (is the package dbus-devel and/or dbus-glib-devel installed?).])]; have_dbus=false)
PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup=true,[AC_MSG_RESULT([* libsoup 2.4 or higher could not be found (is the package libsoup-devel installed?). Without libsoup, the NZBCreator service can't be accessed])]; have_soup=false)
+PKG_CHECK_MODULES(NSS, nss,,[AC_MSG_ERROR([* NSS could not be found (is the package nss-devel installed?)])])
#PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0,,[AC_MSG_ERROR([* GLib-sharp 2.0 or higher could not be found (is the package glib-sharp2-devel installed?)])])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
@@ -48,6 +49,8 @@
AC_SUBST(SOUP_LIBS)
AC_SUBST(SOUP_CFLAGS)
AM_CONDITIONAL(HAVE_SOUP, $have_soup)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(NSS_CFLAGS)
#AC_SUBST(GLIB_SHARP_LIBS)
#AC_SUBST(GLIB_SHARP_CFLAGS)
@@ -347,20 +350,10 @@
[Curl headers could be found],
curl)
-AC_FIND_LIB2(ssl, $ac_default_lib_searchpath, openssl_libraries,
- [OpenSSL libraries.],
- [OpenSSL bibliotheek niet gevonden.])
-
-AC_FIND_HEADER2(openssl/md5.h, $ac_default_inc_searchpath, openssl_headers,
- [OpenSSL headers.],
- [OpenSSL header bestanden niet gevonden.])
-
AC_SUBST(PCRE_CFLAGS, $pcre_headers_CFLAGS)
AC_SUBST(PCRE_LIBS, $pcre_libraries_LIBS)
AC_SUBST(CURL_CFLAGS, $libcurl_headers_CFLAGS)
AC_SUBST(CURL_LIBS, $libcurl_libraries_LIBS)
-AC_SUBST(OPENSSL_CFLAGS, $openssl_headers_CFLAGS)
-AC_SUBST(OPENSSL_LIBS, "$openssl_libraries_LIBS -lcrypto")
# gettext
AC_PROG_INTLTOOL([0.21], [no-xml])
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 22 Aug 2008 19:51:53 -0000 1.11
+++ .cvsignore 13 Sep 2008 18:53:41 -0000 1.12
@@ -1 +1 @@
-nntpgrab-0.3.90.tar.bz2
+nntpgrab-0.3.91.tar.bz2
Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nntpgrab.spec 22 Aug 2008 19:51:53 -0000 1.16
+++ nntpgrab.spec 13 Sep 2008 18:53:41 -0000 1.17
@@ -1,12 +1,13 @@
Summary: NNTPGrab is a program to download files from the usenet
Name: nntpgrab
-Version: 0.3.90
+Version: 0.3.91
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
Source1: nntpgrab_php.ini
Source2: nntpgrab_apache.conf
+Patch0: nntpgrab_use_nss_compat_ossl.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.nntpgrab.nl
@@ -28,13 +29,16 @@
BuildRequires: curl-devel
BuildRequires: libnotify-devel
BuildRequires: sqlite-devel
-BuildRequires: openssl-devel
+BuildRequires: nss-devel
BuildRequires: php-devel
BuildRequires: dbus-devel
BuildRequires: intltool
BuildRequires: libsoup-devel
BuildRequires: par2cmdline
+# necessary for the NSS patch
+BuildRequires: nss_compat_ossl-devel
+
%description
With this program it is possible to download files from the usenet
@@ -130,13 +134,17 @@
%prep
%setup -q
+# Use NSS instead of OpenSSL
+%patch0 -p0
+aclocal
+autoconf
+
%build
%configure
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-mkdir %{buildroot}
make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
desktop-file-install --vendor fedora --delete-original \
@@ -189,6 +197,7 @@
# Install the webinterface to /usr/share/nntpgrab/web
mkdir -p %{buildroot}/%{_datadir}/%{name}/web
cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web
+cp -ad client/web/.htaccess %{buildroot}/%{_datadir}/%{name}/web
rm -rf %{buildroot}/%{_datadir}/%{name}/web/module
rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile*
@@ -231,6 +240,7 @@
%{_libdir}/libnntpgrab.so.0.0.0
%{_libdir}/libnntpgrab_automation.so.0
%{_libdir}/libnntpgrab_automation.so.0.0.0
+%dir %{_libdir}/nntpgrab
%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
@@ -276,6 +286,12 @@
%{_datadir}/nntpgrab/web
%changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
+- Update to 0.3.91
+- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
+- The .htaccess file was missing in the nntpgrab-web subpackage
+- Include %%_libdir/nntpgrab directory
+
* Fri Aug 22 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.90-1
- Update to version 0.3.90 (0.4 beta 1)
- Upstream has changed a lot in the infrastructure:
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 22 Aug 2008 19:51:53 -0000 1.14
+++ sources 13 Sep 2008 18:53:41 -0000 1.15
@@ -1 +1 @@
-a22b9a71fa5e4dcd8c079fd6693421f0 nntpgrab-0.3.90.tar.bz2
+1f14c2a3df74e5bd46218afc26121293 nntpgrab-0.3.91.tar.bz2
- Previous message (by thread): rpms/nntpgrab/F-8 nntpgrab_use_nss_compat_ossl.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nntpgrab.spec, 1.11, 1.12 sources, 1.10, 1.11
- Next message (by thread): rpms/nntpgrab/devel nntpgrab_use_nss_compat_ossl.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 nntpgrab.spec, 1.17, 1.18 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list