nmav pushed to ocserv (epel7). "do not require libtasn1 3.9 for building"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 09:02:08 UTC 2015
>From 2cc1a37e20205a0903f1a8c3503f5dcac9479676 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date: Tue, 31 Mar 2015 10:58:12 +0200
Subject: do not require libtasn1 3.9 for building
diff --git a/ocserv-0.10.2-libtasn1.patch b/ocserv-0.10.2-libtasn1.patch
new file mode 100644
index 0000000..d909db3
--- /dev/null
+++ b/ocserv-0.10.2-libtasn1.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 2f4f5a5..b006d9a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,7 +392,7 @@ if test "$test_for_gssapi" = yes;then
+ PKG_CHECK_MODULES([LIBKRB5], [krb5-gssapi], [
+ enable_gssapi=yes
+ AC_DEFINE([HAVE_GSSAPI], [], [GSSAPI was found])
+-PKG_CHECK_MODULES(LIBTASN1, [libtasn1 >= 3.9])
++PKG_CHECK_MODULES(LIBTASN1, [libtasn1 >= 3.8])
+ ],
+ [
+ AC_MSG_WARN([[
diff --git a/ocserv.spec b/ocserv.spec
index bab4216..ab14b01 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -17,6 +17,7 @@ Source4: PACKAGE-LICENSING
Source6: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
Source7: ocserv-genkey
Source8: ocserv-script
+Patch0: ocserv-0.10.2-libtasn1.patch
# Taken from upstream:
# http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
@@ -39,7 +40,7 @@ BuildRequires: pcllib-devel
BuildRequires: libtalloc-devel
BuildRequires: http-parser-devel
BuildRequires: tcp_wrappers-devel
-BuildRequires: automake, autoconf
+BuildRequires: automake autoconf libtool
BuildRequires: krb5-devel
BuildRequires: libtasn1-devel
BuildRequires: gperf
@@ -84,9 +85,10 @@ sed -i 's/run-as-group = nogroup/run-as-group = nobody/g' tests/*.config
# http://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00062.html
sed -i 's/either version 3 of the License/either version 2 of the License/g' build-aux/snippet/*
touch src/*.proto
+%patch0 -p1 -b .libtasn1
%build
-
+autoreconf -ifv
%configure \
--enable-systemd
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ocserv.git/commit/?h=epel7&id=2cc1a37e20205a0903f1a8c3503f5dcac9479676
More information about the scm-commits
mailing list