rpms/mingw32-gnutls/F-10 gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Richard W.M. Jones
rjones at fedoraproject.org
Mon Mar 9 17:47:17 UTC 2009
- Previous message: rpms/mingw32-gnutls/devel gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/roundup/F-9 bts518768-disable-editcsv.patch, NONE, 1.1 roundup.spec, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-gnutls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/F-10
Modified Files:
.cvsignore sources
Added Files:
gnutls-2.6.2-nosrp.patch import.log
mingw32-gnutls-2.6.3-certtool-build.patch mingw32-gnutls.spec
Log Message:
Initial import.
gnutls-2.6.2-nosrp.patch:
--- NEW FILE gnutls-2.6.2-nosrp.patch ---
diff -up gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp gnutls-2.6.2/lib/gnutlsxx.cpp
--- gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp 2008-11-12 10:56:28.000000000 +0100
+++ gnutls-2.6.2/lib/gnutlsxx.cpp 2008-12-04 14:34:10.000000000 +0100
@@ -396,12 +396,14 @@ void session::set_credentials( credentia
RETWRAP(gnutls_credentials_set( s, cred.get_type(), cred.ptr()));
}
-#ifdef ENABLE_SRP
const char* server_session::get_srp_username() const
{
+#ifdef ENABLE_SRP
return gnutls_srp_server_get_username( s);
-}
+#else
+ return NULL;
#endif
+}
const char* server_session::get_psk_username() const
{
--- NEW FILE import.log ---
mingw32-gnutls-2_6_4-1_fc11:F-10:mingw32-gnutls-2.6.4-1.fc11.src.rpm:1236620807
mingw32-gnutls-2.6.3-certtool-build.patch:
--- NEW FILE mingw32-gnutls-2.6.3-certtool-build.patch ---
--- gnutls-2.6.3.orig/src/Makefile.am 2008-12-12 18:45:34.000000000 +0000
+++ gnutls-2.6.3/src/Makefile.am 2009-01-23 14:30:16.000000000 +0000
@@ -37,35 +37,35 @@
gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c \
common.h common.c select.c
gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
- $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
if ENABLE_SRP
srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c
srptool_LDADD = ../lib/libgnutls.la \
$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \
- ../gl/libgnu.la ../lgl/liblgnu.la
+ ../gl/libgnu.la ../lgl/liblgnu.la -lintl
endif
psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c
psktool_LDADD = ../lib/libgnutls.la \
$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \
- ../gl/libgnu.la ../lgl/liblgnu.la
+ ../gl/libgnu.la ../lgl/liblgnu.la -lintl
gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h \
common.c select.c
gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
- $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c \
tls_test.c tests.h tests.c common.h common.c
gnutls_cli_debug_LDADD = ../lib/libgnutls.la \
$(LIBGCRYPT_LIBS) \
- $(LIBTASN1_LIBS) ../gl/libgnu.la
+ $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h \
certtool-gaa.c certtool.c prime.c certtool-cfg.c
certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
- $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@
+ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl
if HAVE_LIBCFG
certtool_LDADD += -lcfg+
else
@@ -78,11 +78,11 @@
noinst_PROGRAMS = errcodes printlist
errcodes_SOURCES = errcodes.c
errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \
- ../gl/libgnu.la ../lgl/liblgnu.la
+ ../gl/libgnu.la ../lgl/liblgnu.la -lintl
printlist_SOURCES = printlist.c
printlist_LDADD = ../lib/libgnutls.la \
- $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
psk-gaa.c: $(srcdir)/psk.gaa
--- NEW FILE mingw32-gnutls.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}
Name: mingw32-gnutls
Version: 2.6.4
Release: 1%{?dist}
Summary: MinGW GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
Group: Development/Libraries
URL: http://www.gnutls.org/
#Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
# We use the same source tarball as Fedora native package, which
# has the patent tainted SRP code removed.
Source0: gnutls-%{version}-nosrp.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Patch1: gnutls-2.6.2-nosrp.patch
# MinGW-specific patches.
Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch
BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt >= 1.2.2
BuildRequires: mingw32-gettext
BuildRequires: mingw32-iconv
BuildRequires: mingw32-readline
BuildRequires: mingw32-zlib
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
# Yes, really ...
BuildRequires: pkgconfig
# For native /usr/bin/msgfmt etc.
BuildRequires: gettext
Requires: pkgconfig
%description
GnuTLS TLS/SSL encryption library. This library is cross-compiled
for MinGW.
%prep
%setup -q -n gnutls-%{version}
%patch1 -p1 -b .nosrp
%patch1000 -p1 -b .mingw32
for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
touch lib/$i
done
%if 0%{?fedora} > 10
libtoolize --force --copy
aclocal
autoreconf
%endif
%build
PATH="%{_mingw32_bindir}:$PATH" \
%{_mingw32_configure} \
--with-included-libtasn1 \
--disable-srp-authentication \
--disable-static
# %{?_smp_mflags} doesn't build correctly.
make
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
# Remove info and man pages which duplicate stuff in Fedora already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%find_lang gnutls
%clean
rm -rf $RPM_BUILD_ROOT
%files -f gnutls.lang
%defattr(-,root,root)
%doc COPYING COPYING.LIB
%{_mingw32_bindir}/certtool.exe
%{_mingw32_bindir}/gnutls-cli-debug.exe
%{_mingw32_bindir}/gnutls-cli.exe
%{_mingw32_bindir}/gnutls-serv.exe
%{_mingw32_bindir}/libgnutls-26.def
%{_mingw32_bindir}/libgnutls-26.dll
%{_mingw32_bindir}/libgnutls-config
%{_mingw32_bindir}/libgnutls-extra-26.def
%{_mingw32_bindir}/libgnutls-extra-26.dll
%{_mingw32_bindir}/libgnutls-extra-config
%{_mingw32_bindir}/libgnutls-openssl-26.def
%{_mingw32_bindir}/libgnutls-openssl-26.dll
%{_mingw32_bindir}/psktool.exe
%{_mingw32_libdir}/libgnutls-extra.dll.a
%{_mingw32_libdir}/libgnutls-extra.la
%{_mingw32_libdir}/libgnutls-openssl.dll.a
%{_mingw32_libdir}/libgnutls-openssl.la
%{_mingw32_libdir}/libgnutls.dll.a
%{_mingw32_libdir}/libgnutls.la
%{_mingw32_libdir}/pkgconfig/gnutls-extra.pc
%{_mingw32_libdir}/pkgconfig/gnutls.pc
%{_mingw32_includedir}/gnutls/
%{_mingw32_datadir}/aclocal/libgnutls-extra.m4
%{_mingw32_datadir}/aclocal/libgnutls.m4
%changelog
* Mon Mar 9 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.4-1
- New Fedora native version 2.6.4.
* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-5
- Rebuild for mingw32-gcc 4.4
* Thu Feb 19 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-4
- +BR mingw32-gcc-c++
* Fri Feb 6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-3
- Include license.
* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-2
- Rebase to native Fedora version 2.6.3.
- Enable C++ library.
- Use find_lang macro.
- Don't build static library.
- Rebase MinGW patch to 2.6.3.
- +BR mingw32-dlfcn.
- +BR mingw32-readline.
- Force rebuild of libtool.
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.4.2-4
- Requires pkgconfig.
* Thu Nov 13 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.2-3
- fix chain verification issue CVE-2008-4989 (#470079)
- separate out the MinGW-specific patch from the others
* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.2-2
- Rename mingw -> mingw32.
* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.2-1
- New native version.
* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.4.1-9
- Switch to source tar.bz2 with SRP stuff removed
* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.1-8
- Remove duplicate manpages and info files.
* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 2.4.1-7
- Add BR on autoconf, automake and libtool
* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.1-6
- Need to run autoreconf after patching src/Makefile.am.
- Remove static libs.
* Fri Sep 5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.1-5
- Add patch to build certtool.exe because of missing dep of gnulib on intl.
- BuildArch is noarch.
* Thu Sep 4 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.1-3
- Use mingw-filesystem RPM macros.
- Depends on mingw-iconv, mingw-gettext.
* Tue Sep 2 2008 Daniel P. Berrange <berrange at redhat.com> - 2.4.1-2
- List files explicitly and use custom CFLAGS
* Mon Jul 7 2008 Richard W.M. Jones <rjones at redhat.com> - 2.4.1-1
- Initial RPM release, largely based on earlier work from several sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gnutls/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Mar 2009 16:01:45 -0000 1.1
+++ .cvsignore 9 Mar 2009 17:47:14 -0000 1.2
@@ -0,0 +1 @@
+gnutls-2.6.4-nosrp.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gnutls/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Mar 2009 16:01:45 -0000 1.1
+++ sources 9 Mar 2009 17:47:15 -0000 1.2
@@ -0,0 +1 @@
+ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2
- Previous message: rpms/mingw32-gnutls/devel gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/roundup/F-9 bts518768-disable-editcsv.patch, NONE, 1.1 roundup.spec, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list