public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1aa277159a548c26bc2e9861c14f5703e9359dc1
@ 2023-02-16 17:15 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2023-02-16 17:15 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 23286 bytes --]

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  1aa277159a548c26bc2e9861c14f5703e9359dc1 (commit)
       via  8716edf499416b62d0bc7c709327d823e45a1e0d (commit)
       via  7b5056c5193e76d33d2d3507945ba5f842fc3be1 (commit)
       via  0f2677aae74ad1f8258b1774ce638871e29a8f59 (commit)
       via  dbcd9c8e9507021855caf2d46c87944d674e0b6e (commit)
       via  92f2d78e96f7859f37730ff5ba015fa238b87248 (commit)
       via  3ae77bb06bb5a7d2d160080a35013bc294eae407 (commit)
       via  b7309e93750561c49df7a06c19978a150ab72899 (commit)
       via  fa356120e1ddaae08e9536357109cb6f3b17df7b (commit)
       via  620607a3fc2632942f8f9883d96f734493e670b7 (commit)
      from  54f7881d225a05ba50c7544f6e9dbc899e5d6282 (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 1aa277159a548c26bc2e9861c14f5703e9359dc1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:26:30 2023 +0100

    perl-JSON: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8716edf499416b62d0bc7c709327d823e45a1e0d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:24:50 2023 +0100

    bind: Update to 9.19.9
    
    * Also link against krb5 to provide REALM support for nsupdate
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 7b5056c5193e76d33d2d3507945ba5f842fc3be1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:21:14 2023 +0100

    perl-Coro: Update to 6.57
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0f2677aae74ad1f8258b1774ce638871e29a8f59
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:21:13 2023 +0100

    perl-Canary-Stability: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dbcd9c8e9507021855caf2d46c87944d674e0b6e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:19:12 2023 +0100

    perl-DBI: Update to 1.643
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 92f2d78e96f7859f37730ff5ba015fa238b87248
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:17:34 2023 +0100

    squid: Update to 5.7
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3ae77bb06bb5a7d2d160080a35013bc294eae407
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:17:33 2023 +0100

    perl-TimeDate: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b7309e93750561c49df7a06c19978a150ab72899
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:17:32 2023 +0100

    perl-Convert-ASN1: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit fa356120e1ddaae08e9536357109cb6f3b17df7b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:17:31 2023 +0100

    perl-Crypt-OpenSSL-X509: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 620607a3fc2632942f8f9883d96f734493e670b7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Feb 16 17:17:30 2023 +0100

    perl-Crypt-OpenSSL-Guess: New package
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 bind/bind.nm                                       |  3 +-
 .../perl-Canary-Stability.nm                       | 18 ++++----
 .../perl-Convert-ASN1.nm                           | 15 ++++---
 perl-Coro/perl-Coro.nm                             | 23 ++++-------
 .../perl-Crypt-OpenSSL-Guess.nm                    | 15 ++++---
 .../perl-Crypt-OpenSSL-X509.nm                     | 22 ++++++----
 perl-DBI/perl-DBI.nm                               |  8 +++-
 perl-JSON/perl-JSON.nm                             | 48 ++++++++++++++++++++++
 perl-TimeDate/perl-TimeDate.nm                     | 45 ++++++++++++++++++++
 squid/patches/squid-3.0.STABLE1-perlpath.patch     |  9 ----
 squid/patches/squid-3.1.0.9-config.patch           | 26 ------------
 squid/patches/squid-3.1.0.9-location.patch         | 41 ------------------
 squid/squid.nm                                     | 22 +++++-----
 13 files changed, 156 insertions(+), 139 deletions(-)
 copy perl-BDB/perl-BDB.nm => perl-Canary-Stability/perl-Canary-Stability.nm (65%)
 copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Convert-ASN1/perl-Convert-ASN1.nm (63%)
 copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm (63%)
 copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509.nm (57%)
 create mode 100644 perl-JSON/perl-JSON.nm
 create mode 100644 perl-TimeDate/perl-TimeDate.nm
 delete mode 100644 squid/patches/squid-3.0.STABLE1-perlpath.patch
 delete mode 100644 squid/patches/squid-3.1.0.9-config.patch
 delete mode 100644 squid/patches/squid-3.1.0.9-location.patch

Difference in files:
diff --git a/bind/bind.nm b/bind/bind.nm
index 87f459b23..4e7cc30b4 100644
--- a/bind/bind.nm
+++ b/bind/bind.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = bind
-version    = 9.18.10
+version    = 9.19.9
 release    = 1
 
 groups     = Networking/Tools
@@ -26,6 +26,7 @@ build
 		libcap-devel
 		libidn2-devel
 		libuv-devel
+		krb5-devel
 		nghttp2-devel
 		pkg-config
 		openssl-devel >= 1.0.1h-2
diff --git a/perl-Canary-Stability/perl-Canary-Stability.nm b/perl-Canary-Stability/perl-Canary-Stability.nm
new file mode 100644
index 000000000..0b3775cf9
--- /dev/null
+++ b/perl-Canary-Stability/perl-Canary-Stability.nm
@@ -0,0 +1,54 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-Canary-Stability
+version    = 2013
+release    = 1
+thisapp    = Canary-Stability-%{version}
+
+groups     = Development/Libraries
+url        = https://search.cpan.org/dist/Canary::Stability/
+license    = GPL+ or Artistic
+summary    = Canary to check perl compatibility for schmorp's modules.
+
+description
+	This module is used by Schmorp's modules during configuration stage to test
+	the installed perl for compatibility with his modules.
+end
+
+source_dl  = https://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/
+
+build
+	requires
+		perl(ExtUtils::MakeMaker)
+		perl(ExtUtils::ParseXS)
+		libdb-devel
+		pakfire >= 0.9.26-3.1
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}"
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
+	end
+
+	make_install_targets = \
+		pure_install DESTDIR=%{BUILDROOT}
+end
+
+packages
+	package %{name}
+		requires
+			perl(:MODULE_COMPAT_%{perl_version})
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/perl-Convert-ASN1/perl-Convert-ASN1.nm b/perl-Convert-ASN1/perl-Convert-ASN1.nm
new file mode 100644
index 000000000..60a316076
--- /dev/null
+++ b/perl-Convert-ASN1/perl-Convert-ASN1.nm
@@ -0,0 +1,39 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-Convert-ASN1
+version    = 0.33
+release    = 1
+arch       = noarch
+thisapp    = Convert-ASN1-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/Convert-ASN1
+license    = GPL+
+summary    = ASN.1 Encode/Decode library for perl.
+
+description
+	Convert::ASN1 encodes and decodes ASN.1 data structures using BER/DER rules.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/
+
+build
+	requires
+		perl(ExtUtils::MakeMaker)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor
+		make %{PARALLELISMFLAGS}
+	end
+
+	make_install_targets = \
+		pure_install
+end
+
+packages
+	package %{name}
+end
diff --git a/perl-Coro/perl-Coro.nm b/perl-Coro/perl-Coro.nm
index 5f25160ab..7a87e13d1 100644
--- a/perl-Coro/perl-Coro.nm
+++ b/perl-Coro/perl-Coro.nm
@@ -4,12 +4,12 @@
 ###############################################################################
 
 name       = perl-Coro
-version    = 6.42
-release    = 1.1
+version    = 6.57
+release    = 1
 thisapp    = Coro-%{version}
 
 groups     = Development/Libraries
-url        = http://search.cpan.org/dist/Coro/
+url        = https://search.cpan.org/dist/Coro/
 license    = GPL+ or Artistic
 summary    = The only real threads in perl.
 
@@ -20,13 +20,13 @@ description
 	in parallel at the same time even on SMP machines
 end
 
-source_dl  = http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/
+source_dl  = https://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/
 
 build
 	requires
+		perl(Canary::Stability)
 		perl(ExtUtils::MakeMaker)
 		perl(ExtUtils::ParseXS)
-		pakfire >= 0.9.26-3.1
 	end
 
 	prepare_cmds
@@ -37,7 +37,9 @@ build
 	end
 
 	build
-		perl Makefile.PL INSTALLDIRS=perl OPTIMIZE="%{CFLAGS}"
+		perl Makefile.PL INSTALLDIRS=perl NO_PACKLIST=1 NO_PERLLOCAL=1 \
+			OPTIMIZE="%{CFLAGS}" </dev/null
+
 		make %{PARALLELISMFLAGS}
 	end
 
@@ -47,14 +49,7 @@ end
 
 packages
 	package %{name}
-		filter_requires
-			AnyEvent
-			EV
-			Event
-			Guard
-			Storable
-			Coro
-		end
+		filter_requires = (AnyEvent|EV|Event|Guard|Storable|Coro)
 
 		requires
 			perl(:MODULE_COMPAT_%{perl_version})
diff --git a/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm b/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm
new file mode 100644
index 000000000..af137f220
--- /dev/null
+++ b/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm
@@ -0,0 +1,39 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-Crypt-OpenSSL-Guess
+version    = 0.15
+release    = 1
+arch       = noarch
+thisapp    = Crypt-OpenSSL-Guess-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/Crypt-OpenSSL-Guess
+license    = GPL+
+summary    = Guess the OpenSSL include path.
+
+description
+	This package provides helpers to guess OpenSSL include path on any platforms.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/A/AK/AKIYM/
+
+build
+	requires
+		perl(ExtUtils::MakeMaker)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor
+		make %{PARALLELISMFLAGS}
+	end
+
+	make_install_targets = \
+		pure_install
+end
+
+packages
+	package %{name}
+end
diff --git a/perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509.nm b/perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509.nm
new file mode 100644
index 000000000..9ab4b1fbe
--- /dev/null
+++ b/perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509.nm
@@ -0,0 +1,44 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-Crypt-OpenSSL-X509
+version    = 1.914
+release    = 1
+thisapp    = Crypt-OpenSSL-X509-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/Crypt-OpenSSL-X509
+license    = GPL+
+summary    = Perl extension to OpenSSL's X509 API.
+
+description
+	This perl module implements a large majority of OpenSSL's useful X509 API.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/J/JO/JONASBN/
+
+build
+	requires
+		perl(Crypt::OpenSSL::Guess)
+		perl(ExtUtils::MakeMaker)
+		openssl-devel
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor
+		make %{PARALLELISMFLAGS}
+	end
+
+	make_install_targets = \
+		pure_install
+end
+
+packages
+	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/perl-DBI/perl-DBI.nm b/perl-DBI/perl-DBI.nm
index 546c034b9..00e7d52ea 100644
--- a/perl-DBI/perl-DBI.nm
+++ b/perl-DBI/perl-DBI.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = perl-DBI
-version    = 1.636
+version    = 1.643
 release    = 1
 thisapp    = DBI-%{version}
 
@@ -22,6 +22,7 @@ source_dl  = http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/
 
 build
 	requires
+		perl(B)
 		perl(Carp)
 		perl(Cwd)
 		perl(Data::Dumper)
@@ -47,7 +48,10 @@ build
 		perl(base)
 		perl(strict)
 		perl-devel
-		pakfire >= 0.9.26-3.1
+
+		# Only required to successfully perform
+		# the testsuite.
+		perl-core
 	end
 
 	build
diff --git a/perl-JSON/perl-JSON.nm b/perl-JSON/perl-JSON.nm
new file mode 100644
index 000000000..b673ab4ca
--- /dev/null
+++ b/perl-JSON/perl-JSON.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-JSON
+version    = 4.10
+release    = 1
+arch       = noarch
+thisapp    = JSON-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/JSON/
+license    = GPL+ or Artistic
+summary    = JSON (JavaScript Object Notation) encoder/decoder.
+
+description
+	This module is a thin wrapper for JSON::XS-compatible modules with a few 
+	additional features. All the backend modules convert a Perl data structure
+	to a JSON text and vice versa.
+
+	This module uses JSON::XS by default, and when JSON::XS is not available,
+	falls back on JSON::PP, which is in the Perl core since 5.14.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/
+
+build
+	requires
+		perl(ExtUtils::MakeMaker)
+		perl(Test::More)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=perl
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		#make test
+	end
+end
+
+packages
+	package %{name}
+		filter_requires = (JSON::backportPP)
+	end
+end
diff --git a/perl-TimeDate/perl-TimeDate.nm b/perl-TimeDate/perl-TimeDate.nm
new file mode 100644
index 000000000..858846b81
--- /dev/null
+++ b/perl-TimeDate/perl-TimeDate.nm
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = perl-TimeDate
+version    = 2.33
+release    = 1
+arch       = noarch
+thisapp    = TimeDate-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/TimeDate/
+license    = GPL+ or Artistic
+summary    = A Perl module for time and date manipulation
+
+description
+	This module includes a number of smaller modules suited for
+	manipulation of time and date strings with Perl. In particular, the
+	Date::Format and Date::Parse modules can display and read times and
+	dates in various formats, providing a more reliable interface to
+	textual representations of points in time.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/
+
+build
+	requires
+		perl(ExtUtils::MakeMaker)
+		perl(Test::More)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=perl
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
+	end	
+end
+
+packages
+	package %{name}
+end
diff --git a/squid/patches/squid-3.0.STABLE1-perlpath.patch b/squid/patches/squid-3.0.STABLE1-perlpath.patch
deleted file mode 100644
index 19b512e1d..000000000
--- a/squid/patches/squid-3.0.STABLE1-perlpath.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl
---- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath	1996-12-06 18:54:31.000000000 +0100
-+++ squid-3.0.STABLE1/contrib/url-normalizer.pl	2008-01-23 12:07:50.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -Tw
-+#!/usr/bin/perl -Tw
- 
- # From:    Markus Gyger <mgyger(a)itr.ch>
- #
diff --git a/squid/patches/squid-3.1.0.9-config.patch b/squid/patches/squid-3.1.0.9-config.patch
deleted file mode 100644
index 09d7a156e..000000000
--- a/squid/patches/squid-3.1.0.9-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
---- squid-3.0.STABLE9/src/cf.data.pre.config	2008-09-09 18:06:44.000000000 +0200
-+++ squid-3.0.STABLE9/src/cf.data.pre	2008-10-19 23:34:17.000000000 +0200
-@@ -2135,7 +2136,7 @@ DOC_END
- 
- NAME: logfile_rotate
- TYPE: int
--DEFAULT: 10
-+DEFAULT: 0 
- LOC: Config.Log.rotateNumber
- DOC_START
- 	Specifies the number of logfile rotations to make when you
-@@ -3254,11 +3256,11 @@ COMMENT_END
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root 
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root."
- DOC_END
- 
- NAME: mail_from
diff --git a/squid/patches/squid-3.1.0.9-location.patch b/squid/patches/squid-3.1.0.9-location.patch
deleted file mode 100644
index 816b358bd..000000000
--- a/squid/patches/squid-3.1.0.9-location.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -up squid-3.1.0.9/QUICKSTART.location squid-3.1.0.9/QUICKSTART
---- squid-3.1.0.9/QUICKSTART.location	2009-06-26 12:35:27.000000000 +0200
-+++ squid-3.1.0.9/QUICKSTART	2009-07-17 14:03:10.000000000 +0200
-@@ -12,10 +12,9 @@ After you retrieved, compiled and instal
- INSTALL in the same directory), you have to configure the squid.conf
- file. This is the list of the values you *need* to change, because no
- sensible defaults could be defined. Do not touch the other variables
--for now.  We assume you have installed Squid in the default location:
--/usr/local/squid
-+for now.
- 
--Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
-+Uncomment and edit the following lines in /etc/squid/squid.conf:
- 
- ==============================================================================
- 
-@@ -56,7 +55,7 @@ cache_effective_user
- Some configuration lines which are optional but may be needed.
- 
- 
--cache_dir ufs /usr/local/squid/var/cache 100 16 256
-+cache_dir ufs /var/spool/squid 100 16 256
- 
-     Add here (first number, here 100) the amount of hard disk space 
-     (in megabytes) to devote to caching.
-@@ -84,12 +83,12 @@ After editing squid.conf to your liking,
- line TWICE:
- 
- To create any disk cache_dir configured:
--    % /usr/local/squid/sbin/squid -z
-+    % /usr/sbin/squid -z
- 
- To start squid:
--    % /usr/local/squid/sbin/squid 
-+    % /usr/sbin/squid 
- 
--Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
-+Check in the cache.log (/var/log/squid/cache.log) that
- everything is all right.
- 
- Once Squid created all its files (it can take several minutes on some
diff --git a/squid/squid.nm b/squid/squid.nm
index 9db970596..ccd96c27c 100644
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -4,14 +4,15 @@
 ###############################################################################
 
 name       = squid
-major_ver  = 3.1
-version    = %{major_ver}.19
-release    = 2
+major_ver  = 5
+minor_ver  = 7
+version    = %{major_ver}.%{minor_ver}
+release    = 1
 
 groups     = Networking/Daemons
-url        = http://www.squid-cache.org/
+url        = https://www.squid-cache.org/
 license    = GPLv2+
-summary    = The Squid proxy caching server.
+summary    = The Squid proxy caching server
 
 description
 	Squid is a high-performance proxy caching server for Web clients,
@@ -22,7 +23,7 @@ description
 	DNS lookups, and implements negative caching of failed requests.
 end
 
-source_dl  = http://www.squid-cache.org/Versions/v3/%{major_ver}/
+source_dl  = http://www.squid-cache.org/Versions/v%{ver_major}/
 
 build
 	requires
@@ -33,8 +34,8 @@ build
 		samba-devel
 		pam-devel
 		libcap-devel
-		/usr/bin/smbclient
 		shadow-utils
+		systemd-devel
 	end
 
 	CFLAGS += -Wno-error
@@ -58,9 +59,8 @@ build
 		--enable-kill-parent-hack \
 		--enable-snmp \
 		--enable-arp-acl \
-		--enable-ipf-transparent \
 		--enable-htcp \
-		--enable-ssl \
+		--disable-ssl \
 		--enable-forw-via-db \
 		--disable-cache-digests \
 		--enable-poll \
@@ -71,7 +71,7 @@ build
 		--enable-linux-netfilter \
 		--disable-ident-lookups \
 		--enable-internal-dns \
-		--enable-auth=basic,ntlm \
+		--enable-auth \
 		--enable-basic-auth-helpers="LDAP,MSNT,multi-domain-NTLM,PAM,NCSA,SMB,squid_radius_auth" \
 		--enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
 		--enable-ntlm-fail-open \
@@ -148,8 +148,6 @@ packages
 			/bin/systemctl try-restart squid.service >/dev/null 2>&1 || :
 		end
 
-		requires = /usr/bin/smbclient
-
 		filter_requires = perl.Auth.*
 	end
 


hooks/post-receive
--
IPFire 3.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-02-16 17:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-16 17:15 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1aa277159a548c26bc2e9861c14f5703e9359dc1 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox