[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 40a31d41cf79d8baa5c290cf1f179bd8846aac21
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 40a31d41cf79d8baa5c290cf1f179bd8846aac21 (commit) via 70de0a782bd6e031b1d95c7373826ef9d4a40929 (commit) via e9679df59217073e4ce41746031e4adae9ec3934 (commit) via c111f9f2ea9b73f76c972448effb36057f66dc53 (commit) via 43f93e968680bfafc547eb641edf079fb5775079 (commit) via 0e2b1240764f560850c706392ded3c27e94e61de (commit) via f86e11669f58ddfaafc2525b6d30edc074b84105 (commit) via 9222bda9ac93a9b3d63fdfb06f5db876099a53ad (commit) via 46e3fda10ee66c8ee3557f975b09893c253c6bb6 (commit) via f3b6e913bae36610007dcb2175e4a8eb4f7f3a0d (commit) via 0b26a9c6ea95b2194cd64e152af2c8c1ea49a8ab (commit) via 6c8cd74e9d5f74591ad627932f0b272baa5dd115 (commit) via ef30ff5574f55a774ab64ca5184834ae21e78d5f (commit) via 6d690cfabb3fb871748c66e3d225bcb41410c782 (commit) via 3d0728d40b72f48845394b7431078cc4aa08b998 (commit) from fb152933d3ff9a448256309f54cb30ff4193f9d5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 40a31d41cf79d8baa5c290cf1f179bd8846aac21 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 3 06:33:56 2023 +0000
pam: Requires libxcrypt-devel to build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 70de0a782bd6e031b1d95c7373826ef9d4a40929 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 2 16:58:55 2023 +0000
netpbm: Update to 10.73.42
* Fix source URL. * Add some missing perl modules as build dependency.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e9679df59217073e4ce41746031e4adae9ec3934 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 17:11:27 2023 +0100
gmp: Set ABI to 64 for all architectures.
We only build for architectures which have support for 64 Bit. Therefore we do not need this check anymore.
This also fixes build for aarch64 which did not got the correct settings.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c111f9f2ea9b73f76c972448effb36057f66dc53 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 17:01:11 2023 +0100
perl-File-HomeDir: Drop filter_requires
Not needed anymore.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 43f93e968680bfafc547eb641edf079fb5775079 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 17:00:35 2023 +0100
perl-File-Which: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0e2b1240764f560850c706392ded3c27e94e61de Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 16:59:57 2023 +0100
perl-File-HomeDir: Add more build dependencies
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit f86e11669f58ddfaafc2525b6d30edc074b84105 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:56:31 2023 +0100
openldap: Requires libxcrypt to build
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 9222bda9ac93a9b3d63fdfb06f5db876099a53ad Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:55:42 2023 +0100
mpfr: Update to 4.1.0
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 46e3fda10ee66c8ee3557f975b09893c253c6bb6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:55:11 2023 +0100
libmpc: Requires latest mpfr to build.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit f3b6e913bae36610007dcb2175e4a8eb4f7f3a0d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:54:13 2023 +0100
gcc: Requires libxcrypt-devel to build.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0b26a9c6ea95b2194cd64e152af2c8c1ea49a8ab Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:52:37 2023 +0100
fontconfig: Devel package requires libxml2-devel.
Otherwise pkg-config reports the missing libxml2 details.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 6c8cd74e9d5f74591ad627932f0b272baa5dd115 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 2 15:51:14 2023 +0100
compat-openssl: Add more build dependencies.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit ef30ff5574f55a774ab64ca5184834ae21e78d5f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Mar 1 20:28:46 2023 +0100
openssl: Add more build dependencies.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 6d690cfabb3fb871748c66e3d225bcb41410c782 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Mar 1 20:27:40 2023 +0100
perl-WWW-Curl: Add patchset to compile with newer curl.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 3d0728d40b72f48845394b7431078cc4aa08b998 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Mar 1 19:44:07 2023 +0100
dhcpcd: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-----------------------------------------------------------------------
Summary of changes: compat-openssl/compat-openssl.nm | 6 +- dhcpcd/dhcpcd.nm | 82 ++++++++++++++++++++++ dhcpcd/dhcpcd.tmpfiles | 1 + dhcpcd/systemd/dhcpcd@.service | 15 ++++ fontconfig/fontconfig.nm | 6 +- gcc/gcc.nm | 3 +- gmp/gmp.nm | 10 ++- libmpc/libmpc.nm | 4 +- mpfr/mpfr.nm | 2 +- netpbm/netpbm.nm | 8 ++- openldap/openldap.nm | 3 +- openssl/openssl.nm | 7 +- pam/pam.nm | 3 +- perl-File-HomeDir/perl-File-HomeDir.nm | 18 +---- .../perl-File-Which.nm | 26 +++---- ...ip-preprocessor-symbol-only-CURL_STRICTER.patch | 34 +++++++++ .../02-WWW-Curl-4.17-define-CURL-as-void.patch | 21 ++++++ ...Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch | 41 +++++++++++ perl-WWW-Curl/perl-WWW-Curl.nm | 4 +- 19 files changed, 247 insertions(+), 47 deletions(-) create mode 100644 dhcpcd/dhcpcd.nm create mode 100644 dhcpcd/dhcpcd.tmpfiles create mode 100644 dhcpcd/systemd/dhcpcd@.service copy perl-File-Remove/perl-File-Remove.nm => perl-File-Which/perl-File-Which.nm (50%) create mode 100644 perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch create mode 100644 perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch create mode 100644 perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch
Difference in files: diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm index 6f38281f1..ae35bc356 100644 --- a/compat-openssl/compat-openssl.nm +++ b/compat-openssl/compat-openssl.nm @@ -5,7 +5,7 @@
name = compat-openssl version = 1.1.1s -release = 2 +release = 2.1 thisapp = openssl-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -27,6 +27,9 @@ build bc gnutls-devel perl + perl(FindBin) + perl(File::Copy) + perl(File::Compare) perl(Test::Harness) util-linux zlib-devel @@ -49,6 +52,7 @@ build build ./Configure \ --prefix=/usr \ + --libdir=%{libdir} \ --openssldir=/etc/pki/tls \ shared \ zlib-dynamic \ diff --git a/dhcpcd/dhcpcd.nm b/dhcpcd/dhcpcd.nm new file mode 100644 index 000000000..99c244498 --- /dev/null +++ b/dhcpcd/dhcpcd.nm @@ -0,0 +1,82 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = dhcpcd +version = 9.4.1 +release = 1 + +groups = Network/Base +url = https://roy.marples.name/projects/dhcpcd/ +license = BSD +summary = A DHCP and DHCPv6 client. + +description + dhcpcd is a DHCP and DHCPv6 client. It is currently the most feature-rich + open source DHCP client. +end + +source_dl = https://roy.marples.name/downloads/dhcpcd/ +sources = %{thisapp}.tar.xz + +build + configure_options += \ + --dbdir=%{sharedstatedir}/dhcpcd + + prepare_cmds + %{create_user} + end + + test + make test + end + + install_cmds + # Assign db directory to the correct user and group. + chown dhcpcd:dhcpcd %{BUILDROOT}%{sharedstatedir}/dhcpcd + end +end + +create_user + getent group dhcpcd >/dev/null || groupadd -r dhcpcd + getent passwd dhcpcd >/dev/null || useradd -r -g dhcpcd \ + -d /var/lib/dhcpcd -s /sbin/nologin -c "DHCP client user" dhcpcd +end + +packages + package %{name} + prerequires + shadow-utils + systemd-units + end + + configfiles + %{sysconfdir}/dhcpcd.conf + end + + datafiles + %{sharedstatedir}/dhcpcd + end + + script prein + %{create_user} + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/dhcpcd/dhcpcd.tmpfiles b/dhcpcd/dhcpcd.tmpfiles new file mode 100644 index 000000000..176366a65 --- /dev/null +++ b/dhcpcd/dhcpcd.tmpfiles @@ -0,0 +1 @@ +d /run/dhcpcd 0755 dhcpcd dhcpcd - diff --git a/dhcpcd/systemd/dhcpcd@.service b/dhcpcd/systemd/dhcpcd@.service new file mode 100644 index 000000000..3543e6c3d --- /dev/null +++ b/dhcpcd/systemd/dhcpcd@.service @@ -0,0 +1,15 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target +BindsTo=sys-subsystem-net-devices-%i.device +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=forking +PIDFile=/run/dhcpcd/%I.pid +ExecStart=/usr/sbin/dhcpcd -q %I +ExecStop=/usr/sbin/dhcpcd -x %I + +[Install] +WantedBy=multi-user.target diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm index 6dcd6dafb..ce9dc7489 100644 --- a/fontconfig/fontconfig.nm +++ b/fontconfig/fontconfig.nm @@ -5,7 +5,7 @@
name = fontconfig version = 2.13.1 -release = 1 +release = 1.1
groups = System/Graphics url = https://fontconfig.org/ @@ -58,6 +58,10 @@ packages
package %{name}-devel template DEVEL + + requires + libxml2-devel + end end
package %{name}-debuginfo diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 2ac8665a3..4764ec0a5 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_graphite = 1
name = gcc version = 12.2.0 -release = 2 +release = 2.1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -41,6 +41,7 @@ build isl-devel >= 0.15 libffi-devel libmpc-devel >= 1.0.1 + libxcrypt-devel mpfr-devel >= 3.1.0 perl texinfo diff --git a/gmp/gmp.nm b/gmp/gmp.nm index 4b72d27a0..3e207b558 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -5,7 +5,7 @@
name = gmp version = 6.2.1 -release = 1 +release = 1.1
groups = System/Libraries url = https://gmplib.org/ @@ -31,11 +31,9 @@ build m4 end
- export ABI = standard - - if "%{DISTRO_ARCH}" == "x86_64" - ABI = 64 - end + # Set ABI to "64" because we currently only + # build for architectures which supports 64 Bits. + export ABI = 64
configure_options += \ --enable-cxx \ diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index 4e7dcd4f0..fb6aacc44 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -5,7 +5,7 @@
name = libmpc version = 1.3.1 -release = 1 +release = 1.1 thisapp = mpc-%{version}
groups = System/Libraries @@ -24,7 +24,7 @@ source_dl = https://ftp.gnu.org/gnu/mpc/ build requires gmp-devel >= 5.0.0 - mpfr-devel >= 4.0.0 + mpfr-devel >= 4.1.0 end
configure_options += \ diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index a2df35ee2..01eb97db8 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mpfr -version = 4.0.2 +version = 4.1.0 release = 1
groups = System/Libraries diff --git a/netpbm/netpbm.nm b/netpbm/netpbm.nm index 07c49295c..49488e5fa 100644 --- a/netpbm/netpbm.nm +++ b/netpbm/netpbm.nm @@ -4,11 +4,11 @@ ###############################################################################
name = netpbm -version = 10.73.41 +version = 10.73.42 release = 1
groups = System/Libraries -url = http://netpbm.sourceforge.net/ +url = https://netpbm.sourceforge.net/ license = BSD and GPLv2 and IJG and MIT and Public Domain summary = A library for handling different graphics file formats.
@@ -19,7 +19,7 @@ description .ppm (portable pixmaps) and others. end
-source_dl = https://netcologne.dl.sourceforge.net/project/netpbm/super_stable/%%7Bversio... +source_dl = https://sourceforge.net/projects/netpbm/files/super_stable/%%7Bversion%7D/ sources = %{thisapp}.tgz
build @@ -33,6 +33,8 @@ build libtiff-devel libxml2-devel zlib-devel + perl + perl(English) end
prepare_cmds diff --git a/openldap/openldap.nm b/openldap/openldap.nm index 1faf968c1..d00727c8d 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -5,7 +5,7 @@
name = openldap version = 2.6.3 -release = 1 +release = 1.1
groups = System/Daemons url = https://www.openldap.org/ @@ -34,6 +34,7 @@ build libdb-devel < 6 libtool libtool-devel + libxcrypt-devel openssl-devel pth-devel shadow-utils diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 1f3718377..e26aa3fba 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -5,7 +5,7 @@
name = openssl version = 3.0.7 -release = 1 +release = 1.1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -26,9 +26,13 @@ build ca-certificates coreutils perl + perl(FindBin) + perl(File::Compare) + perl(File::Copy) perl(IPC::Cmd) perl(Math::BigInt) perl(Module::Load::Conditional) + perl(Pod::Html) perl(Test::Harness) perl(Test::More) sed @@ -53,6 +57,7 @@ build build ./Configure \ --prefix=%{prefix} \ + --libdir=%{libdir} \ --openssldir=%{sysconfdir}/pki/tls \ shared \ zlib \ diff --git a/pam/pam.nm b/pam/pam.nm index de24a97fb..8a1b6741b 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -5,7 +5,7 @@
name = pam version = 1.5.2 -release = 1 +release = 1.1 thisapp = Linux-PAM-%{version}
groups = System/Base @@ -27,6 +27,7 @@ build bison cracklib-devel flex + libxcrypt-devel end
export LD_LIBRARY_PATH = %{DIR_APP}/libpam/.libs diff --git a/perl-File-HomeDir/perl-File-HomeDir.nm b/perl-File-HomeDir/perl-File-HomeDir.nm index 9045a38e6..406b08538 100644 --- a/perl-File-HomeDir/perl-File-HomeDir.nm +++ b/perl-File-HomeDir/perl-File-HomeDir.nm @@ -5,7 +5,7 @@
name = perl-File-HomeDir version = 1.00 -release = 1 +release = 1.2 arch = noarch thisapp = File-HomeDir-%{version}
@@ -28,10 +28,12 @@ build perl perl(Config) perl(Cwd) >= 3.12 + perl(FindBin) perl(ExtUtils::MakeMaker) >= 6.42 perl(ExtUtils::MM_Unix) perl(File::Path) >= 2.01 perl(File::Spec) >= 3.12 + perl(Module::Install) perl(strict) perl(vars) end @@ -46,18 +48,4 @@ end
packages package %{name} - filter_requires - Cwd - File::Path - File::Spec - File::Temp - File::Which - Mac::perl - Win32 - end - - requires - perl - end - end end diff --git a/perl-File-Which/perl-File-Which.nm b/perl-File-Which/perl-File-Which.nm new file mode 100644 index 000000000..76aa89001 --- /dev/null +++ b/perl-File-Which/perl-File-Which.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-File-Which +version = 1.27 +release = 1 +arch = noarch +thisapp = File-Which-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/File-Which/ +license = GPL+ +summary = Perl implementation of the which utility as an API. + +description + File::Which finds the full or relative paths to executable programs + on the system. This is normally the function of which utility. + + which is typically implemented as either a program or a built in shell + command. +end + +source_dl = https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/ + +build + requires + perl(Env) + perl(ExtUtils::MakeMaker) >= 6.42 + perl(ExtUtils::MM_Unix) + perl(Test::More) + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + test + make test + end +end + +packages + package %{name} +end diff --git a/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch new file mode 100644 index 000000000..34221c0d2 --- /dev/null +++ b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch @@ -0,0 +1,34 @@ +From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com +Date: Mon, 12 Sep 2016 14:40:44 +0200 +Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CURL_STRICTER leaked into curl-constants.c when building against +curl-7.50.2. This is a preprocessor only macro without a value. + +CPAN RT#117793 + +Signed-off-by: Petr Písař ppisar@redhat.com +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..ad2bd3d 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.7.4 + diff --git a/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch new file mode 100644 index 000000000..1fa9b5457 --- /dev/null +++ b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch @@ -0,0 +1,21 @@ +diff -up ./Curl.xs.orig ./Curl.xs +--- ./Curl.xs.orig 2019-10-18 07:45:38.380881448 +0200 ++++ ./Curl.xs 2019-10-18 07:46:20.712032844 +0200 +@@ -47,7 +47,7 @@ typedef enum { + + typedef struct { + /* The main curl handle */ +- struct CURL *curl; ++ CURL *curl; + I32 *y; + /* Lists that can be set via curl_easy_setopt() */ + struct curl_slist *slist[SLIST_LAST]; +@@ -73,7 +73,7 @@ typedef struct { + #ifdef __CURL_MULTI_H + struct CURLM *curlm; + #else +- struct void *curlm; ++ void *curlm; + #endif + } perl_curl_multi; + diff --git a/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch new file mode 100644 index 000000000..3d6829b0c --- /dev/null +++ b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch @@ -0,0 +1,41 @@ +From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com +Date: Thu, 9 Apr 2020 14:31:05 +0200 +Subject: [PATCH] Adapt to changes in cURL 7.69.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and +then added under a CURL_WIN32 name +(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor +macro for driving the C compiler, not a cURL option. Thus this fix +ignores it. + +CURLOPT(na,t,nu) macro was added +(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT() +macro. It's not a cURL option. This fix also ignores it. + +CPAN RT#132197 + +Signed-off-by: Petr Písař ppisar@redhat.com +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index ad2bd3d..b9e6a46 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.21.1 + diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm index 736a80ede..20619266a 100644 --- a/perl-WWW-Curl/perl-WWW-Curl.nm +++ b/perl-WWW-Curl/perl-WWW-Curl.nm @@ -5,7 +5,7 @@
name = perl-WWW-Curl version = 4.17 -release = 1.1 +release = 1.2 thisapp = WWW-Curl-%{version}
groups = Development/Libraries @@ -21,8 +21,10 @@ source_dl = http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/
build requires + perl(FindBin) perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + perl(Module::Install) libcurl-devel pakfire >= 0.9.26-3.1 end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer