From e4bb83fb74d960f74c04a02be0e8fa4677dd522f Mon Sep 17 00:00:00 2001
From: 4fury-c3440d8 <uglyside@yandex.ru>
Date: Sat, 23 Oct 2021 00:39:51 +0300
Subject: [PATCH] serf rebuild new scons.

---
 network/library/serf/actions.py            |  2 +-
 network/library/serf/files/scons_py3.patch | 24 ++++++++++++++++++++++
 network/library/serf/pspec.xml             | 14 +++++++++++--
 network/library/serf/translations.xml      |  2 +-
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 network/library/serf/files/scons_py3.patch

diff --git a/network/library/serf/actions.py b/network/library/serf/actions.py
index 6fbde04b4a..f7e380a548 100644
--- a/network/library/serf/actions.py
+++ b/network/library/serf/actions.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import scons
diff --git a/network/library/serf/files/scons_py3.patch b/network/library/serf/files/scons_py3.patch
new file mode 100644
index 0000000000..144f5e39ea
--- /dev/null
+++ b/network/library/serf/files/scons_py3.patch
@@ -0,0 +1,24 @@
+--- serf-1.3.9/SConstruct.orig	2019-07-26 17:49:30.910189251 +0000
++++ serf-1.3.9/SConstruct	2019-07-26 17:49:54.073821735 +0000
+@@ -163,9 +163,9 @@
+               suffix='.def', src_suffix='.h')
+   })
+ 
+-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+-                  'SERF_MINOR_VERSION ([0-9]+).*'
+-                  'SERF_PATCH_VERSION ([0-9]+)',
++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
++                  b'SERF_MINOR_VERSION ([0-9]+).*'
++                  b'SERF_PATCH_VERSION ([0-9]+)',
+                   env.File('serf.h').get_contents(),
+                   re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+@@ -183,7 +183,7 @@
+ 
+ unknown = opts.UnknownVariables()
+ if unknown:
+-  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++  print ('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+ 
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/network/library/serf/pspec.xml b/network/library/serf/pspec.xml
index 2a8e300dd8..2c7c1ad314 100644
--- a/network/library/serf/pspec.xml
+++ b/network/library/serf/pspec.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>serf</Name>
-        <Homepage>https://code.google.com/p/serf/</Homepage>
+        <Homepage>https://serf.apache.org/</Homepage>
         <Packager>
             <Name>Osman Erkan</Name>
             <Email>osman.erkan@pisilinux.org</Email>
@@ -22,6 +22,9 @@
             <Dependency>apr-util-devel</Dependency>
             <Dependency>scons</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>scons_py3.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -54,6 +57,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2021-10-22</Date>
+            <Version>1.3.9</Version>
+            <Comment>Rebuild</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2020-02-26</Date>
             <Version>1.3.9</Version>
diff --git a/network/library/serf/translations.xml b/network/library/serf/translations.xml
index d1ec00cb1d..a2bdee9e91 100644
--- a/network/library/serf/translations.xml
+++ b/network/library/serf/translations.xml
@@ -10,4 +10,4 @@
         <Name>serf-devel</Name>
         <Summary xml:lang="tr">serf için geliştirme dosyaları</Summary>
     </Package>
-</PISI>
\ No newline at end of file
+</PISI>