Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aee38bc71e1120098aaa0f80fcabeeb5e30772db)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aee38bc71e1120098aaa0f80fcabeeb5e30772db)
  • Date: Wed, 25 Jun 2014 13:59:01 -0500

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

dev/null |binary
net/pptp-linux/BUILD | 2 +-
net/pptp-linux/DEPENDS | 4 +++-
net/pptp-linux/DETAILS | 12 +++++++-----
net/pptp-linux/HISTORY | 11 +++++++++++
net/pptp-linux/PRE_BUILD | 4 ++++
net/pptp-linux/options.patch | 15 +++++++++++++++
net/pptp-linux/pptp.gpg |binary
8 files changed, 41 insertions(+), 7 deletions(-)

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

pptp-linux: => 1.8.0

diff --git a/net/pptp-linux/BUILD b/net/pptp-linux/BUILD
index 190baed..7206258 100755
--- a/net/pptp-linux/BUILD
+++ b/net/pptp-linux/BUILD
@@ -1 +1 @@
-make DESTDIR="$INSTALL_ROOT" OPTIMIZE="$CFLAGS"
+make DESTDIR="$INSTALL_ROOT" IP="/sbin/ip" OPTIMIZE="$CFLAGS"
diff --git a/net/pptp-linux/DEPENDS b/net/pptp-linux/DEPENDS
index 37f3364..9ae843d 100755
--- a/net/pptp-linux/DEPENDS
+++ b/net/pptp-linux/DEPENDS
@@ -1 +1,3 @@
-depends ppp
+depends ppp &&
+depends perl &&
+depends iproute2
diff --git a/net/pptp-linux/DETAILS b/net/pptp-linux/DETAILS
index 778234b..50d4a00 100755
--- a/net/pptp-linux/DETAILS
+++ b/net/pptp-linux/DETAILS
@@ -1,15 +1,17 @@
SPELL=pptp-linux
- VERSION=1.7.2
+ VERSION=1.8.0
SOURCE=pptp-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pptp-$VERSION
+ SOURCE2=$SOURCE.signature
SOURCE_URL[0]=$SOURCEFORGE_URL/pptpclient/$SOURCE
-
#SOURCE_HASH=sha512:1b57d933b818b6115d847116ce17bb377713eebf76cfb791e085ced42291e56045ec807310b898ec0684e9251d232f59dc12b56cc63fa834a6767cd198a1f4d9
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.signature
+ SOURCE_GPG=pptp.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/pptp-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://pptpclient.sourceforge.net/
KEYWORDS="microsoft net pptp"
ENTERED=20030602
- SHORT="A Linux client for the Microsoft PPTP protocol."
+ SHORT="Linux client for the Microsoft PPTP protocol"
cat << EOF
PPTP Client is a Linux, FreeBSD and NetBSD client for the proprietary
Microsoft Point-to-Point Tunneling Protocol, PPTP. Allows connection
diff --git a/net/pptp-linux/HISTORY b/net/pptp-linux/HISTORY
index f8d9fa9..7d85c12 100644
--- a/net/pptp-linux/HISTORY
+++ b/net/pptp-linux/HISTORY
@@ -1,3 +1,14 @@
+2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0; converted to upstream pgp signature
+ check; quoting paths; cleaned up
+ * DEPENDS: added missing dependency: iproute2
+ * BUILD: fixed ip binary path
+ * PRE_BUILD: added, to apply patch
+ * options.patch: added, to prevent options file from trashing on
+ non-castfs systems
+ * pptp.gpg: added, AE2466C0 public key (James Cameron
+ <quozl AT us.netrek.org>) imported
+
2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated VERSION to 1.7.2

diff --git a/net/pptp-linux/PRE_BUILD b/net/pptp-linux/PRE_BUILD
new file mode 100755
index 0000000..5409d5e
--- /dev/null
+++ b/net/pptp-linux/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/options.patch"
diff --git a/net/pptp-linux/options.patch b/net/pptp-linux/options.patch
new file mode 100644
index 0000000..ec25535
--- /dev/null
+++ b/net/pptp-linux/options.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2013-10-23 12:10:46.000000000 +0400
++++ Makefile 2014-06-25 22:45:47.565785309 +0400
+@@ -76,8 +76,10 @@
+ mkdir -p $(MANDIR)
+ install -m 644 pptp.8 $(MANDIR)
+ install -m 644 pptpsetup.8 $(MANDIR)
+- mkdir -p $(PPPDIR)
+- install -m 644 options.pptp $(PPPDIR)
++ if [ ! -f $(PPPDIR)/options.pptp ]; then \
++ mkdir -p $(PPPDIR) ; \
++ install -m 644 options.pptp $(PPPDIR) ; \
++ fi
+
+ uninstall:
+ $(RM) $(BINDIR)/pptp $(MANDIR)/pptp.8
diff --git a/net/pptp-linux/pptp-1.7.2.tar.gz.sig
b/net/pptp-linux/pptp-1.7.2.tar.gz.sig
deleted file mode 100644
index 24dfee7..0000000
Binary files a/net/pptp-linux/pptp-1.7.2.tar.gz.sig and /dev/null differ
diff --git a/net/pptp-linux/pptp.gpg b/net/pptp-linux/pptp.gpg
new file mode 100644
index 0000000..4801ede
Binary files /dev/null and b/net/pptp-linux/pptp.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aee38bc71e1120098aaa0f80fcabeeb5e30772db), Vlad Glagolev, 06/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page