Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 net/3proxy/BUILD             |    4 ++++
 net/3proxy/DETAILS           |    4 ++--
 net/3proxy/HISTORY           |    6 ++++++
 net/3proxy/PRE_BUILD         |    2 ++
 net/3proxy/system-pcre.patch |   12 ++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit c97441927591f4e01246cfa0ad85e5b06c5ac0f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    3proxy: => 0.8.13

diff --git a/net/3proxy/BUILD b/net/3proxy/BUILD
index 337ba22..9387f0f 100755
--- a/net/3proxy/BUILD
+++ b/net/3proxy/BUILD
@@ -11,6 +11,10 @@ else
   PLUGINS="${THREE_PROXY_PLUGINS}"
 fi &&
 
+if list_find "${PLUGINS}" "PCREPlugin"; then
+  LIBS="-lpcre ${LIBS}"
+fi &&
+
 if list_find "${PLUGINS}" "SSLPlugin"; then
   LIBS="-lcrypto -lssl ${LIBS}"
 fi &&
diff --git a/net/3proxy/DETAILS b/net/3proxy/DETAILS
index 646e41d..ecb142e 100755
--- a/net/3proxy/DETAILS
+++ b/net/3proxy/DETAILS
@@ -1,8 +1,8 @@
            SPELL=3proxy
-         VERSION=0.8.12
+         VERSION=0.8.13
           SOURCE=${SPELL}-${VERSION}.tar.gz
    
SOURCE_URL[0]=https://github.com/z3APA3A/${SPELL}/archive/${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
+     
SOURCE_HASH=sha512:94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
             DOCS="Release.notes authors copying ${DOCS}"
         WEB_SITE=https://3proxy.org/
diff --git a/net/3proxy/HISTORY b/net/3proxy/HISTORY
index 9d9d319..cbd43dc 100644
--- a/net/3proxy/HISTORY
+++ b/net/3proxy/HISTORY
@@ -1,3 +1,9 @@
+2020-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.8.13
+       * BUILD: link against pcre
+       * PRE_BUILD: apply patch
+       * system-pcre.patch: added, to build with system pcre library
+
 2019-05-19 Vlad Glagolev <stealth AT sourcemage.org>
        * {PRE_,}BUILD, DEPENDS, DETAILS, INSTALL, CONFIGURE, init.d/3proxy:
          created spell, version 0.8.12
diff --git a/net/3proxy/PRE_BUILD b/net/3proxy/PRE_BUILD
index 03c45ea..df9a487 100755
--- a/net/3proxy/PRE_BUILD
+++ b/net/3proxy/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
+patch -p0 < "${SPELL_DIRECTORY}/system-pcre.patch" &&
+
 # /etc/3proxy/3proxy.cfg
 sedit "s:/usr/local::" src/stringtable.c &&
 # respect user compilation flags
diff --git a/net/3proxy/system-pcre.patch b/net/3proxy/system-pcre.patch
new file mode 100644
index 0000000..209a13a
--- /dev/null
+++ b/net/3proxy/system-pcre.patch
@@ -0,0 +1,12 @@
+--- src/plugins/PCREPlugin/Makefile.inc.orig   2020-05-16 18:02:17.316248221 
+0000
++++ src/plugins/PCREPlugin/Makefile.inc        2020-05-16 18:08:54.986220288 
+0000
+@@ -67,5 +67,7 @@
+ pcreposix$(OBJSUFFICS): pcreposix.c
+       $(CC) $(DCFLAGS) $(CFLAGS) pcreposix.c
+ 
+-$(BUILDDIR)PCREPlugin$(DLSUFFICS): pcre_compile$(OBJSUFFICS) 
pcre_config$(OBJSUFFICS) pcre_dfa_exec$(OBJSUFFICS) pcre_exec$(OBJSUFFICS) 
pcre_fullinfo$(OBJSUFFICS) pcre_get$(OBJSUFFICS) pcre_globals$(OBJSUFFICS) 
pcre_info$(OBJSUFFICS) pcre_maketables$(OBJSUFFICS) pcre_newline$(OBJSUFFICS) 
pcre_ord2utf8$(OBJSUFFICS) pcre_refcount$(OBJSUFFICS) pcre_study$(OBJSUFFICS) 
pcre_tables$(OBJSUFFICS) pcre_try_flipped$(OBJSUFFICS) 
pcre_ucp_searchfuncs$(OBJSUFFICS) pcre_valid_utf8$(OBJSUFFICS) 
pcre_version$(OBJSUFFICS) pcre_xclass$(OBJSUFFICS) pcre_dftables$(OBJSUFFICS) 
pcre_plugin$(OBJSUFFICS) pcreposix$(OBJSUFFICS)
+-      $(LN) $(LNOUT)../../$(BUILDDIR)PCREPlugin$(DLSUFFICS) $(LDFLAGS) 
$(DLFLAGS) pcre_compile$(OBJSUFFICS) pcre_config$(OBJSUFFICS) 
pcre_dfa_exec$(OBJSUFFICS) pcre_exec$(OBJSUFFICS) pcre_fullinfo$(OBJSUFFICS) 
pcre_get$(OBJSUFFICS) pcre_globals$(OBJSUFFICS) pcre_info$(OBJSUFFICS) 
pcre_maketables$(OBJSUFFICS) pcre_newline$(OBJSUFFICS) 
pcre_ord2utf8$(OBJSUFFICS) pcre_refcount$(OBJSUFFICS) pcre_study$(OBJSUFFICS) 
pcre_tables$(OBJSUFFICS) pcre_try_flipped$(OBJSUFFICS) 
pcre_ucp_searchfuncs$(OBJSUFFICS) pcre_valid_utf8$(OBJSUFFICS) 
pcre_version$(OBJSUFFICS) pcre_xclass$(OBJSUFFICS) pcre_dftables$(OBJSUFFICS) 
pcre_plugin$(OBJSUFFICS) pcreposix$(OBJSUFFICS)
++#PCRE_OBJS += pcre_compile$(OBJSUFFICS) pcre_config$(OBJSUFFICS) 
pcre_dfa_exec$(OBJSUFFICS) pcre_exec$(OBJSUFFICS) pcre_fullinfo$(OBJSUFFICS) 
pcre_get$(OBJSUFFICS) pcre_globals$(OBJSUFFICS) pcre_info$(OBJSUFFICS) 
pcre_maketables$(OBJSUFFICS) pcre_newline$(OBJSUFFICS) 
pcre_ord2utf8$(OBJSUFFICS) pcre_refcount$(OBJSUFFICS) pcre_study$(OBJSUFFICS) 
pcre_tables$(OBJSUFFICS) pcre_try_flipped$(OBJSUFFICS) 
pcre_ucp_searchfuncs$(OBJSUFFICS) pcre_valid_utf8$(OBJSUFFICS) 
pcre_version$(OBJSUFFICS) pcre_xclass$(OBJSUFFICS) pcre_dftables$(OBJSUFFICS) 
pcre_plugin$(OBJSUFFICS) pcreposix$(OBJSUFFICS)
++
++$(BUILDDIR)PCREPlugin$(DLSUFFICS): $(PCRE_OBJS) pcre_plugin$(OBJSUFFICS)
++      $(LN) $(LNOUT)../../$(BUILDDIR)PCREPlugin$(DLSUFFICS) $(LDFLAGS) 
$(DLFLAGS) $^