Merge ~unity7maintainers/ubuntu/+source/nux:applied/ubuntu/devel into ubuntu/+source/nux:ubuntu/devel

[Rahammetoela Toekiman]

imported pcre2 migration from the gentoo team

[Rahammetoela Toekiman (fuseteam)]

it currently fails to build, but i am having trouble figuring out why: https://launchpadlibrarian.net/830926741/buildlog.txt.gz

[Athos Ribeiro (athos)]

Thanks, Rahammetoela. Can you point us to the gentoo change from where this is being pulled from?

Also, this should be a patch under debian/patches. This should help you getting started: https://documentation.ubuntu.com/project/contributors/patching/work-with-debian-patches/

[Rahammetoela Toekiman (fuseteam)]

> Thanks, Rahammetoela. Can you point us to the gentoo change from where this is
> being pulled from?

I actually got it as a patch file from them via telegram

> Also, this should be a patch under debian/patches. This should help you
> getting started:
> https://documentation.ubuntu.com/project/contributors/patching/work-with-
> debian-patches/

is there particular reason why it should be under debian/patches?

[Skia (skia)]

debian/patches is the only place where the Debian build system will look for patches to apply before building, that's why your patch needs to go there. The link provided by @athos explains many things about how to work with patches.
I'm unsubscribing ~ubuntu-sponsors, feel free to resubscribed once you have performed the necessary changes and it's ready for review again.

review: Needs Fixing

Unmerged commits

ef41b97... by Rahammetoela Toekiman on 2025-11-10

migrate to libpcre2

4e62389... by Sebastien Bacher on 2025-07-24

4.0.8+18.10.20180623-0ubuntu11 (patches applied)

Imported using git-ubuntu import.

ca0c0e5... by Steve Langasek on 2024-03-31

4.0.8+18.10.20180623-0ubuntu10 (patches applied)

Imported using git-ubuntu import.

0bff976... by Steve Langasek on 2024-03-11

4.0.8+18.10.20180623-0ubuntu9 (patches applied)

Imported using git-ubuntu import.

9da570f... by Steve Langasek on 2024-03-08

4.0.8+18.10.20180623-0ubuntu8 (patches applied)

Imported using git-ubuntu import.

3dacbb2... by Matthias Klose on 2024-02-19

4.0.8+18.10.20180623-0ubuntu7 (patches applied)

Imported using git-ubuntu import.

8e1c06b... by Matthias Klose on 2024-02-19

4.0.8+18.10.20180623-0ubuntu6 (patches applied)

Imported using git-ubuntu import.

9fbfc6f... by Dimitri John Ledkov on 2023-09-22

4.0.8+18.10.20180623-0ubuntu5 (patches applied)

Imported using git-ubuntu import.

82b9772... by Jeremy Bícha on 2022-03-10

4.0.8+18.10.20180623-0ubuntu4 (patches applied)

Imported using git-ubuntu import.

c3fe967... by Michael Hudson-Doyle on 2020-06-09

4.0.8+18.10.20180623-0ubuntu3 (patches applied)

Imported using git-ubuntu import.

diff --git a/Nux/Validator.cpp b/Nux/Validator.cpp
index 0723930..a1021e7 100644
--- a/Nux/Validator.cpp
+++ b/Nux/Validator.cpp
@@ -27,12 +27,19 @@ namespace nux
 {
 
   Validator::Validator()
+#if !defined(NUX_OS_WINDOWS)
+    : _regexp(nullptr)
+#endif
   {
   }
 
   Validator::~Validator()
   {
 
+#if !defined(NUX_OS_WINDOWS)
+    if (_regexp)
+      pcre2_code_free(_regexp);
+#endif
   }
 
   bool Validator::InitRegExp()
@@ -41,18 +48,23 @@ namespace nux
     regex_ = _regexp_str.c_str();
     return true;
 #else
-    const char *error;
-    int   erroffset;
-    _regexp = pcre_compile(
-      _regexp_str.c_str(),    /* the pattern */
-      PCRE_MULTILINE,
-      &error,         /* for error message */
-      &erroffset,     /* for error offset */
-      0);             /* use default character tables */
+    int        errorcode;
+    PCRE2_SIZE erroroffset;
+    _regexp = pcre2_compile(
+      reinterpret_cast<PCRE2_SPTR>(_regexp_str.c_str()),  /* pattern */
+      PCRE2_ZERO_TERMINATED,                              /* pattern length */
+      PCRE2_MULTILINE,                                    /* option bits */
+      &errorcode,                                         /* error code */
+      &erroroffset,                                       /* error offset */
+      nullptr);                                           /* compile context */
 
     if (!_regexp)
     {
-      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.c_str());
+      PCRE2_UCHAR buffer[256];
+      pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
+      nuxDebugMsg("[Validator::InitRegExp] Invalid regular expression '%s' "
+                  "at offset %d: %s",
+                  _regexp_str.c_str(), (int)erroroffset, buffer);
       return false;
     }    
     return true;
@@ -72,20 +84,24 @@ namespace nux
     }
     return Validator::Acceptable;
 #else
-    if (_regexp == 0)
+    if (!_regexp || !str)
       return Validator::Invalid;
 
-    int out_vector [10];
-    unsigned int offset = 0;
-    int len = (int) strlen(str);
+    pcre2_match_data *match_data =
+        pcre2_match_data_create_from_pattern(_regexp, nullptr);
+
+    int rc = pcre2_match(
+        _regexp,                                   /* compiled pattern */
+        reinterpret_cast<PCRE2_SPTR>(str),         /* subject string */
+        strlen(str),                               /* length of subject */
+        0,                                         /* start offset */
+        0,                                         /* match options */
+        match_data,                                /* match data block */
+        nullptr);                                  /* match context */
 
-    // See the "PCRE DISCUSSION OF STACK USAGE" and why it maybe necessary to limit the stack usage.
-    pcre_extra extra;
-    extra.flags = PCRE_EXTRA_MATCH_LIMIT_RECURSION;
-    extra.match_limit_recursion = 2000; 
+    pcre2_match_data_free(match_data);
 
-    int rc = pcre_exec(_regexp, &extra, str, len, offset, 0, out_vector, 10);
-    if (rc <= -1)
+    if (rc < 0)
     {
       return Validator::Invalid;
     }
diff --git a/Nux/Validator.h b/Nux/Validator.h
index ed729fc..4d7e9a5 100644
--- a/Nux/Validator.h
+++ b/Nux/Validator.h
@@ -26,7 +26,8 @@
 #if defined(NUX_OS_WINDOWS)
   #include <regex>
 #else
-  #include <pcre.h>
+  #define PCRE2_CODE_UNIT_WIDTH 8
+  #include <pcre2.h>
 #endif
 
 namespace nux
@@ -57,7 +58,7 @@ namespace nux
 #if defined(NUX_OS_WINDOWS)
     std::regex regex_;
 #else
-    pcre *_regexp;
+    pcre2_code *_regexp;
 #endif
   };
 }
diff --git a/configure.ac b/configure.ac
index a375300..8b047e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ PKG_CHECK_MODULES(NUX,
                   sigc++-2.0
                   pango
                   pangocairo
-                  libpcre
+                  libpcre2-8
                   )
 AC_SUBST(NUX_CFLAGS)
 AC_SUBST(NUX_LIBS)
diff --git a/debian/changelog b/debian/changelog
index 0e1b9d7..ec74964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nux (4.0.8+18.10.20180623-0ubuntu12) resolute; urgency=medium
+
+  * migrated to libpcre2 (lp: #2103918)
+
+ -- Rahammetoela Toekiman <[e-mail]>  Sun, 09 Nov 2025 22:17:47 -0300
+
 nux (4.0.8+18.10.20180623-0ubuntu11) questing; urgency=medium
 
   * d/control: use the non deprecated libgdk-pixbuf-2.0-dev (lp: #2118581)