Merge pull request #11411 from Rmys/master

openvpn ver. bump

hardware/disk/btrfs-progs/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Userspace utilities for btrfs</Summary>
         <Description>btrfs-progs package provides all the userspace programs needed to create, check, modify and correct any inconsistencies in the btrfs filesystem.</Description>
-        <Archive sha1sum="1bc8687c4674020544c165b498cf56f3f1b895ef" type="targz">https://github.com/kdave/btrfs-progs/archive/v6.1.2.tar.gz</Archive>
+        <Archive sha1sum="56873294edce0d81efac02f6098f36ef7a6806ee" type="targz">https://github.com/kdave/btrfs-progs/archive/v6.1.3.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>xmlto</Dependency>
             <Dependency>asciidoc</Dependency>
@@ -63,6 +63,13 @@
     </Package>
 
     <History>
+        <Update release="17">
+            <Date>2023-01-26</Date>
+            <Version>6.1.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="16">
             <Date>2023-01-07</Date>
             <Version>6.1.2</Version>

network/connection/openvpn/actions.py

@@ -47,8 +47,8 @@ def install():
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/server.conf", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/client.conf", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/firewall.sh", "/etc/openvpn")
-    pisitools.domove("/usr/share/openvpn/sample/sample-config-files/xinetd-server-config", "/etc/openvpn")
+    # pisitools.domove("/usr/share/openvpn/sample/sample-config-files/xinetd-server-config", "/etc/openvpn")
-    pisitools.domove("/usr/share/openvpn/sample/sample-config-files/xinetd-client-config", "/etc/openvpn")
+    # pisitools.domove("/usr/share/openvpn/sample/sample-config-files/xinetd-client-config", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/loopback-server", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/loopback-client", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-config-files/openvpn-startup.sh", "/etc/openvpn")

network/connection/openvpn/pspec.xml

@@ -13,7 +13,7 @@
         <PartOf>network.connection</PartOf>
         <Summary>A full featured SSL VPN solution</Summary>
         <Description>OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including remote access, site-to-site VPNs, WiFi security, and enterprise-scale remote access solutions with load balancing, failover, and fine-grained access-controls.</Description>
-        <Archive sha1sum="95953448917005845e8d3586f93cd5291a0730b6" type="tarxz">https://swupdate.openvpn.org/community/releases/openvpn-2.5.2.tar.xz</Archive>
+        <Archive sha1sum="0151614d6fbdb01bbd06f61294f97244c59e0230" type="targz">https://swupdate.openvpn.org/community/releases/openvpn-2.6.0.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile permission="0755" target="openvpn-test.sh">openvpn-test.sh</AdditionalFile>
         </AdditionalFiles>
@@ -26,6 +26,7 @@
             <Dependency>lzo-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>p11-kit-devel</Dependency>
+            <Dependency>libcap-ng-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -39,6 +40,7 @@
             <Dependency>openssl</Dependency>
             <Dependency>p11-kit</Dependency>
             <Dependency>iproute2</Dependency>
+            <Dependency>libcap-ng</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -62,6 +64,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2023-01-26</Date>
+            <Version>2.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2021-05-10</Date>
             <Version>2.5.2</Version>