control: fixed -1 1.2-1.2
Sorry I fixed before noticing this bug, in my weekly check of what NMU went
good and what went bad
G.
diff -Nru libapache2-mod-auth-cas-1.2/debian/changelog
libapache2-mod-auth-cas-1.2/debian/changelog
--- libapache2-mod-auth-cas-1.2/debian/changelog 2019-02-15
15:14:09.000000000 +0100
+++ libapache2-mod-auth-cas-1.2/debian/changelog 2024-10-30
08:39:55.000000000 +0100
@@ -1,3 +1,26 @@
+libapache2-mod-auth-cas (1.2-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Also run dh_autoreconf before configuring, to correctly
+ update configure script and find pcre2
+
+ -- Gianfranco Costamagna <[email protected]> Wed, 30 Oct 2024
08:39:55 +0100
+
+libapache2-mod-auth-cas (1.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ zhangdandan <[email protected]> ]
+ * update the outdated config.{guess,sub} to recognize the LoongArch
+ (Closes: #1074033, #1053792)
+
+ [ Gianfranco Costamagna ]
+ * cherry-pick upstream fix for pcre2 switch (Closes: #1000068)
+ - d/p/209.patch
+ * Update homepage field (Closes: #945228)
+
+ -- Gianfranco Costamagna <[email protected]> Thu, 24 Oct 2024
19:01:15 +0200
+
libapache2-mod-auth-cas (1.2-1) unstable; urgency=medium
* New upstream release.
diff -Nru libapache2-mod-auth-cas-1.2/debian/control
libapache2-mod-auth-cas-1.2/debian/control
--- libapache2-mod-auth-cas-1.2/debian/control 2019-01-30 14:56:14.000000000
+0100
+++ libapache2-mod-auth-cas-1.2/debian/control 2024-10-29 07:38:24.000000000
+0100
@@ -2,11 +2,11 @@
Section: httpd
Priority: optional
Maintainer: Thijs Kinkhorst <[email protected]>
-Build-Depends: debhelper (>= 12), dh-apache2, apache2-dev, libssl-dev,
libcurl4-openssl-dev, libpcre3-dev
+Build-Depends: debhelper (>= 12), dh-apache2, apache2-dev, libssl-dev,
libcurl4-openssl-dev, libpcre2-dev
Standards-Version: 4.3.0
Vcs-Git: https://salsa.debian.org/debian/libapache2-mod-auth-cas.git
Vcs-Browser: https://salsa.debian.org/debian/libapache2-mod-auth-cas
-Homepage: https://wiki.jasig.org/display/casc/mod_auth_cas
+Homepage: https://github.com/apereo/mod_auth_cas
Rules-Requires-Root: binary-targets
Package: libapache2-mod-auth-cas
diff -Nru libapache2-mod-auth-cas-1.2/debian/copyright
libapache2-mod-auth-cas-1.2/debian/copyright
--- libapache2-mod-auth-cas-1.2/debian/copyright 2018-05-30
13:12:05.000000000 +0200
+++ libapache2-mod-auth-cas-1.2/debian/copyright 2024-10-24
19:01:15.000000000 +0200
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mod_auth_cas
-Source: https://wiki.jasig.org/display/CASC/mod_auth_cas
+Source: https://github.com/apereo/mod_auth_cas
Files: *
Copyright: © 2007,2008 Phil Ames <[email protected]>
diff -Nru libapache2-mod-auth-cas-1.2/debian/patches/209.patch
libapache2-mod-auth-cas-1.2/debian/patches/209.patch
--- libapache2-mod-auth-cas-1.2/debian/patches/209.patch 1970-01-01
01:00:00.000000000 +0100
+++ libapache2-mod-auth-cas-1.2/debian/patches/209.patch 2024-10-24
19:01:15.000000000 +0200
@@ -0,0 +1,176 @@
+From 486fce9fda27f6708ac9f6be53b7ba71c3a9b4e0 Mon Sep 17 00:00:00 2001
+From: "Scott A. Williams" <[email protected]>
+Date: Fri, 3 Mar 2023 18:35:27 -0800
+Subject: [PATCH 1/4] Port pcre calls to pcre2.
+
+Signed-off-by: Scott A. Williams <[email protected]>
+---
+ README | 2 +-
+ README.win32 | 2 +-
+ config.h.in | 2 +-
+ configure | 12 ++++++------
+ configure.ac | 4 ++--
+ src/mod_auth_cas.c | 12 ++++++------
+ 6 files changed, 17 insertions(+), 17 deletions(-)
+
+Index: libapache2-mod-auth-cas-1.2/README
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/README
++++ libapache2-mod-auth-cas-1.2/README
+@@ -49,7 +49,7 @@
+ * Apache Portable Runtime Utilities - 1.2.7 or higher
+ * Apache Web Server - 2.2.3 or higher
+ * libcurl - 7.18.2 or higher
+-* libpcre - 7.8 or higher
++* libpcre2 - 10 or higher
+
+ Download the distribution via git or tarball. Because git does not
+ preserve timestamps, autoconf may determine it is necessary to bootstrap
+Index: libapache2-mod-auth-cas-1.2/README.win32
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/README.win32
++++ libapache2-mod-auth-cas-1.2/README.win32
+@@ -22,7 +22,7 @@
+ NOTE: As of mod_auth_cas 1.0.9, Win32 support has been dropped due
+ to lack of development resources and low community interest.
+ As a result, these instructions may be inaccurate. As an
+- explicit example, the additional curl and libpcre dependencies are
++ explicit example, the additional curl and libpcre2 dependencies are
+ not addressed in these instructions at all.
+
+ ====================================================================
+Index: libapache2-mod-auth-cas-1.2/config.h.in
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/config.h.in
++++ libapache2-mod-auth-cas-1.2/config.h.in
+@@ -15,7 +15,7 @@
+ /* Define to 1 if you have a functional curl library. */
+ #undef HAVE_LIBCURL
+
+-/* Define to 1 if you have the `pcre' library (-lpcre). */
++/* Define to 1 if you have the `pcre2' library (-lpcre2). */
+ #undef HAVE_LIBPCRE
+
+ /* Define to 1 if you have the `ssl' library (-lssl). */
+Index: libapache2-mod-auth-cas-1.2/configure
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/configure
++++ libapache2-mod-auth-cas-1.2/configure
+@@ -14129,14 +14129,14 @@
+ unset _libcurl_with
+
+
+-# Checks for libpcre
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre"
>&5
+-$as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
++# Checks for libpcre2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre2_compile in
-lpcre2" >&5
++$as_echo_n "checking for pcre2_compile in -lpcre2... " >&6; }
+ if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpcre $LIBS"
++LIBS="-lpcre2 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -14146,11 +14146,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char pcre_compile ();
++char pcre2_compile ();
+ int
+ main ()
+ {
+-return pcre_compile ();
++return pcre2_compile ();
+ ;
+ return 0;
+ }
+@@ -14171,10 +14171,10 @@
+ #define HAVE_LIBPCRE 1
+ _ACEOF
+
+- LIBS="-lpcre $LIBS"
++ LIBS="-lpcre2 $LIBS"
+
+ else
+- as_fn_error $? "libpcre required" "$LINENO" 5
++ as_fn_error $? "libpcre2 required" "$LINENO" 5
+ fi
+
+
+Index: libapache2-mod-auth-cas-1.2/configure.ac
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/configure.ac
++++ libapache2-mod-auth-cas-1.2/configure.ac
+@@ -137,8 +137,8 @@
+ #### Check for libcurl
+ LIBCURL_CHECK_CONFIG([yes],[],[],[AC_MSG_ERROR([libcurl development files
required])])
+
+-# Checks for libpcre
+-AC_CHECK_LIB([pcre], [pcre_compile], [], [AC_MSG_ERROR([libpcre required])])
++# Checks for libpcre2
++AC_CHECK_LIB([pcre2-8], [pcre2_compile_8], [], [AC_MSG_ERROR([libpcre2
required])])
+
+ # Checks for header files.
+ AC_CHECK_HEADERS([netdb.h stddef.h sys/socket.h unistd.h])
+Index: libapache2-mod-auth-cas-1.2/src/mod_auth_cas.c
+===================================================================
+--- libapache2-mod-auth-cas-1.2.orig/src/mod_auth_cas.c
++++ libapache2-mod-auth-cas-1.2/src/mod_auth_cas.c
+@@ -44,7 +44,8 @@
+ #include "util_md5.h"
+ #include "ap_config.h"
+ #include "ap_release.h"
+-#include "pcre.h"
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include "pcre2.h"
+ #include "apr_buckets.h"
+ #include "apr_file_info.h"
+ #include "apr_lib.h"
+@@ -2380,32 +2381,35 @@
+ * name and the attr_spec is a tilde (denotes a PCRE match). */
+ else if (!(*attr_c) && (*spec_c) == '~') {
+ const cas_saml_attr_val *val;
+- const char *errorptr;
+- int erroffset;
+- pcre *preg;
++ int errorcode;
++ PCRE2_SIZE erroffset;
++ pcre2_code *preg;
++ uint32_t options = PCRE2_UTF;
++ pcre2_match_data *preg_match;
+
+ /* Skip the tilde */
+ spec_c++;
+
+ /* Set up the regex */
+- preg = pcre_compile(spec_c, 0, &errorptr, &erroffset,
NULL);
++ preg = pcre2_compile((PCRE2_SPTR)spec_c,
PCRE2_ZERO_TERMINATED, options, &errorcode, &erroffset, NULL);
+ if (NULL == preg) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"Pattern [%s] is not a valid regular expression", spec_c);
+ continue;
+ }
+
+ /* Compare the attribute values */
++ preg_match = pcre2_match_data_create_from_pattern(preg,
NULL);
+ val = attr->values;
+ for ( ; val; val = val->next) {
+ /* PCRE-compare the attribute value. At this
point, spec_c
+ * points to the NULL-terminated value pattern.
*/
+- if (0 == pcre_exec(preg, NULL, val->value,
(int)strlen(val->value), 0, 0, NULL, 0)) {
+- pcre_free(preg);
++ if (0 <= pcre2_match(preg,
(PCRE2_SPTR)val->value, (int)strlen(val->value), 0, 0, preg_match, 0)) {
++ pcre2_match_data_free(preg_match);
+ return CAS_ATTR_MATCH;
+ }
+ }
+
+- pcre_free(preg);
++ pcre2_match_data_free(preg_match);
+ }
+ }
+ return CAS_ATTR_NO_MATCH;
diff -Nru libapache2-mod-auth-cas-1.2/debian/patches/series
libapache2-mod-auth-cas-1.2/debian/patches/series
--- libapache2-mod-auth-cas-1.2/debian/patches/series 2019-02-15
15:14:00.000000000 +0100
+++ libapache2-mod-auth-cas-1.2/debian/patches/series 2024-10-24
19:01:15.000000000 +0200
@@ -0,0 +1 @@
+209.patch
diff -Nru libapache2-mod-auth-cas-1.2/debian/README.Debian
libapache2-mod-auth-cas-1.2/debian/README.Debian
--- libapache2-mod-auth-cas-1.2/debian/README.Debian 2018-05-30
13:12:05.000000000 +0200
+++ libapache2-mod-auth-cas-1.2/debian/README.Debian 2024-10-24
19:01:15.000000000 +0200
@@ -14,7 +14,7 @@
in the README file under "CONFIGURING THE SOFTWARE".
More instructions may be available from :
-https://wiki.jasig.org/display/CASC/mod_auth_cas
+https://github.com/apereo/mod_auth_cas
Note that in the default configuration mod-auth-cas stores the cookie
expiration information and the tickets in /var/cache/apache2/mod_auth_cas
diff -Nru libapache2-mod-auth-cas-1.2/debian/rules
libapache2-mod-auth-cas-1.2/debian/rules
--- libapache2-mod-auth-cas-1.2/debian/rules 2019-01-09 10:33:42.000000000
+0100
+++ libapache2-mod-auth-cas-1.2/debian/rules 2024-10-30 08:39:24.000000000
+0100
@@ -11,6 +11,8 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+ dh_update_autotools_config
+ dh_autoreconf
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
$(shell dpkg-buildflags --export=configure)
touch $@
