public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/files/, net-misc/sstp-client/
@ 2019-08-17  7:58 Maxim Koltsov
  0 siblings, 0 replies; 2+ messages in thread
From: Maxim Koltsov @ 2019-08-17  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     7d57e44f5ad77e12dc33648d9ace431d88699349
Author:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 07:28:10 2019 +0000
Commit:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 07:57:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d57e44f

net-misc/sstp-client: bump to 1.0.12

Package-Manager: Portage-2.3.71, Repoman-2.3.12
Signed-off-by: Maxim Koltsov <maksbotan <AT> gentoo.org>

 net-misc/sstp-client/Manifest                      |  1 +
 .../files/sstp-client-1.0.12-fix-example.patch     | 16 +++++++
 .../sstp-client-1.0.12-remove-network-test.patch   | 11 +++++
 net-misc/sstp-client/sstp-client-1.0.12.ebuild     | 56 ++++++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 13f6d60ca4c..b52914daab1 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,2 +1,3 @@
 DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B 6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7
 DIST sstp-client-1.0.11.tar.gz 3035707 BLAKE2B f534060bc47599a372b95b25400e7cb09911eb0216b11faa5bdcf0241d7c5caabd7df6065e58dff2b6b1f6c4e416499f58f92900da024d0ad0684aa3cc4d9abd SHA512 d22b03f1bc2d5215def6ce198d6e81b08a5cebc4db9de269bc2e66785845521f0606a96af5d9d257dcf78addafee8ad3d942de0075f47038fbfe0b5051002487
+DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f

diff --git a/net-misc/sstp-client/files/sstp-client-1.0.12-fix-example.patch b/net-misc/sstp-client/files/sstp-client-1.0.12-fix-example.patch
new file mode 100644
index 00000000000..f2b81174fc1
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.12-fix-example.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.am	2018-02-07 21:51:10.451717813 +0100
++++ b/Makefile.am	2018-02-07 21:54:43.811708840 +0100
+@@ -7,11 +7,11 @@
+           include           \
+           src
+ 
+-docdir         = $(datadir)/doc/@PACKAGE@
+ pkgconfigdir   = $(libdir)/pkgconfig
+ pkgconfig_DATA = sstp-client-1.0.pc
+ 
+-doc_DATA       = \
++examplesdir = $(docdir)/examples
++examples_DATA = \
+ 	sstp-test.example \
+ 	sstp-test-nopty.example
+ 

diff --git a/net-misc/sstp-client/files/sstp-client-1.0.12-remove-network-test.patch b/net-misc/sstp-client/files/sstp-client-1.0.12-remove-network-test.patch
new file mode 100644
index 00000000000..d6868f3e26b
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.12-remove-network-test.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2018-02-07 21:42:37.755739374 +0100
++++ b/src/Makefile.am	2018-02-07 21:45:28.855732178 +0100
+@@ -23,7 +23,7 @@
+     utest_fcs           \
+     utest_route
+ 
+-TESTS= $(check_PROGRAMS)
++TESTS= utest_task utest_cmac utest_chap utest_fcs
+ 
+ sstpc_SOURCES =         \
+     sstp-client.c       \

diff --git a/net-misc/sstp-client/sstp-client-1.0.12.ebuild b/net-misc/sstp-client/sstp-client-1.0.12.ebuild
new file mode 100644
index 00000000000..767cbdd4709
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info user
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+RDEPEND=">=dev-libs/libevent-2.0.10
+	dev-libs/openssl:0=
+	net-dialup/ppp:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=( "${FILESDIR}/${P}-remove-network-test.patch"
+	  "${FILESDIR}/${P}-fix-example.patch"
+)
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+pkg_setup() {
+	enewgroup sstpc
+	enewuser sstpc -1 -1 -1 sstpc
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER=${PPPD_VER#*/*-}		# reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*}		# main version without beta/pre/patch/revision
+	econf \
+		--enable-ppp-plugin \
+		--enable-group=sstpc \
+		--enable-user=sstpc \
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
+		--with-runtime-dir="/run/sstpc" \
+		$(use_enable static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/files/, net-misc/sstp-client/
@ 2023-01-23  2:40 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-01-23  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     9ca397b84cc1ffec4736e22e757f79aeb4294891
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 02:31:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 02:32:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca397b8

net-misc/sstp-client: add 1.0.18

Closes: https://bugs.gentoo.org/870865
Closes: https://bugs.gentoo.org/854858
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/sstp-client/Manifest                      |  1 +
 .../files/sstp-client-1.0.18-includes.patch        | 42 ++++++++++++++
 net-misc/sstp-client/sstp-client-1.0.18.ebuild     | 65 ++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index aeeb04f63c6c..c04331a85465 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1 +1,2 @@
 DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
+DIST sstp-client-1.0.18.tar.gz 477886 BLAKE2B 3a2929a5245a703c36b9bf6c17b7f65d911446a8a44b95894fd990ccf5ad01a98e4b5e843681e4643ff4b28a57de359a98ef42f9bb378d52c6829297970399b6 SHA512 e0dd0fe57b65c2001737222159e58b11177a8f1cb64564e520fad2199c0581d0550a00f49c921be74039dec59062233b4716f8b624a0e4cb48bdf8df9272f93c

diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch
new file mode 100644
index 000000000000..3a768f50e889
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch
@@ -0,0 +1,42 @@
+https://gitlab.com/eivnaes/sstp-client/-/merge_requests/4
+
+From 1d822cca1c4e5b4db91bcbabe29bf43c05449af7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 02:26:28 +0000
+Subject: [PATCH 1/2] libsstp-log: add missing <time.h> include
+
+Needed for time_t. Fixes build w/ GCC 12 on musl.
+
+Bug: https://bugs.gentoo.org/854858
+--- a/src/libsstp-log/sstp-log-private.h
++++ b/src/libsstp-log/sstp-log-private.h
+@@ -24,6 +24,7 @@
+ #ifndef __SSTP_LOG_PRIVATE_H__
+ #define __SSTP_LOG_PRIVATE_H__
+ 
++#include <time.h>
+ 
+ /*! Keep attributes aligned to a 32-bit boundary */
+ #define LOG_ALIGN32(n)  \
+
+From 835c6226aaccb4c39a8c50dec5d3afd87315fddd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 02:28:18 +0000
+Subject: [PATCH 2/2] pppd-plugin: workaround broken pppd.h header for memcpy
+
+ppp's pppd.h defines a BCOPY macro which expands to memcpy but doesn't
+include <string.h> which provides it. Include it in pppd-plugin instead
+to workaround it, as it'll be a while before we can assume the system ppp
+is fixed.
+
+Bug: https://bugs.gentoo.org/870865
+--- a/src/pppd-plugin/sstp-mppe.c
++++ b/src/pppd-plugin/sstp-mppe.c
+@@ -24,6 +24,7 @@
+ 
+ #include <config.h>
+ 
++#include <string.h>
+ #include <pppd/pppd.h>
+ #include <sstp-mppe.h>
+ 

diff --git a/net-misc/sstp-client/sstp-client-1.0.18.ebuild b/net-misc/sstp-client/sstp-client-1.0.18.ebuild
new file mode 100644
index 000000000000..d11d4f1ace70
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.18.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+DEPEND="dev-libs/libevent:=
+	dev-libs/openssl:=
+	net-dialup/ppp:="
+RDEPEND="${DEPEND}
+	acct-group/sstpc
+	acct-user/sstpc"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+	"${FILESDIR}/${PN}-1.0.18-includes.patch"
+)
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	local myeconfargs=(
+		--enable-ppp-plugin
+		--enable-group=sstpc
+		--enable-user=sstpc
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+		--with-runtime-dir="/run/sstpc"
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-23  2:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-23  2:40 [gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/files/, net-misc/sstp-client/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2019-08-17  7:58 Maxim Koltsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox