[haiku-commits] haiku: hrev43379 - build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 2 Dec 2011 18:06:48 +0100 (CET)
hrev43379 adds 3 changesets to branch 'master'
old head: 44dffa86c0d19c178f1c5f7b6b1d0d90fb160701
new head: 9bcf0b2e39d94576bd9a760e3606cdf78f6cd8f8
----------------------------------------------------------------------------
64e63a6: Updated openssh optionalpackage
* Updated sshd_keymaker.sh script to use --group instead of --app
f8631ec: Merge branch 'master' of ssh://git.haiku-os.org/haiku
9bcf0b2: Merge branch 'master' of ssh://git.haiku-os.org/haiku
[ Scott McCreary <scottmc2@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 files changed, 4 insertions(+), 4 deletions(-)
build/jam/OptionalPackages | 8 ++++----
############################################################################
Commit: 64e63a6bb5ec22f9842bc0103d5718ab747ea9b1
URL: http://cgit.haiku-os.org/haiku/commit/?id=64e63a6
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Wed Nov 30 20:57:01 2011 UTC
Updated openssh optionalpackage
* Updated sshd_keymaker.sh script to use --group instead of --app
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 8473f81..0a4be3f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1267,12 +1267,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- openssh-5.9p1-x86-gcc4-2011-09-08.zip
- :
$(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ;
+ openssh-5.9p1-x86-gcc4-2011-11-30.zip
+ :
$(baseURL)/openssh-5.9p1-x86-gcc4-2011-11-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- openssh-5.9p1-x86-gcc2-2011-09-09.zip
- :
$(baseURL)/openssh-5.9p1-x86-gcc2-2011-09-09.zip ;
+ openssh-5.9p1-x86-gcc2-2011-11-30.zip
+ :
$(baseURL)/openssh-5.9p1-x86-gcc2-2011-11-30.zip ;
}
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
############################################################################
Commit: f8631ec46e7852ccf115e77504df8d32f53fd942
URL: http://cgit.haiku-os.org/haiku/commit/?id=f8631ec
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Fri Dec 2 01:08:23 2011 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
############################################################################
Revision: hrev43379
Commit: 9bcf0b2e39d94576bd9a760e3606cdf78f6cd8f8
URL: http://cgit.haiku-os.org/haiku/commit/?id=9bcf0b2
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Fri Dec 2 17:00:49 2011 UTC
Merge branch 'master' of ssh://git.haiku-os.org/haiku
----------------------------------------------------------------------------
Other related posts:
