[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2fe555552aa918594235c063c4178e059dece55e)

Vlad Glagolev scm at sourcemage.org
Tue Dec 7 03:25:06 EST 2010


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

 crypto/openssh/DETAILS   |    6 ------
 crypto/openssh/HISTORY   |    5 +++++
 crypto/openssh/PREPARE   |    1 -
 crypto/openssh/PRE_BUILD |    7 -------
 4 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 2fe555552aa918594235c063c4178e059dece55e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openssh: complete sftpfilecontrol patch deprecation

diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index da9b4be..3b4a8ef 100755
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -3,12 +3,6 @@
   SECURITY_PATCH=4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
-#if [[ $SFTP_FILECONTROL == y ]]; then
-#      PATCHLEVEL=2
-#         SOURCE3=openssh-5.4p1.sftpfilecontrol-v1.3.patch
-#    SOURCE3_HASH=sha512:45716ba1a811086926265750e73b3aff7d98f6b08e0a1a3f4d92103527b7d7d93514e2950df443c2b95ef8e646f672e10b4c2a0a2d8f21314b2d6f94cae5f6b7
-#  SOURCE3_URL[0]=http://sftpfilecontrol.sourceforge.net/download/v1.3/$SOURCE3
-#fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 882c522..1f00b60 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,8 @@
+2010-12-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: removed sftp file control patch support (not needed anymore
+	  since sftp-server(8) has ``-u'' flag)
+	* PRE{PARE,_BUILD}: removed
+
 2010-10-08 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: removed sftp filecontrol patch until it's fixed with newer
 	  openssh version
diff --git a/crypto/openssh/PREPARE b/crypto/openssh/PREPARE
deleted file mode 100755
index 794406a..0000000
--- a/crypto/openssh/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SFTP_FILECONTROL "Do you want to apply sftp filecontrol patch?" n
diff --git a/crypto/openssh/PRE_BUILD b/crypto/openssh/PRE_BUILD
deleted file mode 100755
index e1b6829..0000000
--- a/crypto/openssh/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $SFTP_FILECONTROL == y ]]; then
-  unpack_file 3 &&
-  patch -p1 < "$SOURCE_CACHE/$SOURCE3"
-fi



More information about the SM-Commit mailing list