mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 19:56:32 +02:00
fix(net-misc/openssh): delete unneeded files
This commit is contained in:
Brandon Philips
parent
3c08d48c1d
commit
dc3f897349
@ -1,6 +1,9 @@
|
||||
# ChangeLog for net-misc/openssh
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.465 2013/01/22 02:51:55 robbat2 Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.466 2013/02/21 05:30:13 zmedico Exp $
|
||||
|
||||
21 Feb 2013; Zac Medico <zmedico@gentoo.org> openssh-6.1_p1-r1.ebuild:
|
||||
Fix for prefix and add ~arm-linux + ~x86-linux keywords.
|
||||
|
||||
22 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> openssh-6.1_p1-r1.ebuild:
|
||||
Whitespace.
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11 WHIRLPOOL 2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb
|
||||
AUX openssh-5.2_p1-autoconf.patch 386 SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb SHA512 80a2244e243492d3933646a32fa673078efd72d0e87939b326c2210f23d72675839cfefa2f31617279d51834cc34daf2c3c189c9d92b08875b6b4f68fa7f3844 WHIRLPOOL d4ca3dd8554863d074054489a2dbe5aca3d07fcc5858e908caa5d76dcf8beb661cc3ca6d22a02ab2ca9f504160a6a1acc7f45a4fa775d879b02ee1ae3d113926
|
||||
AUX openssh-5.2_p1-gsskex-fix.patch 408 SHA256 8190db31ed2e8dc6ce79030e5c648d04610b06dd8366df5948ef6e990314ee96 SHA512 2022cd25b3e07430752569e07165db313e49a0902ef251df3e50ca96197849be6efbdee360a3a435cae0b5d2dda55acc8676b232d3584f87e204c2fc04b92801 WHIRLPOOL 65da9f3450493ca9a25741e66b2ecf97d7a5576c15485ff3a7c08fc57b06a17b3b6e73b14d2962bf958d9326a6d54c2940f56eb42de4bd5011324bba84c67cca
|
||||
@ -46,7 +49,14 @@ DIST openssh-lpk-6.1p1-0.3.14.patch.gz 18458 SHA256 2d0e40116e021913668519a42743
|
||||
EBUILD openssh-5.9_p1-r4.ebuild 9210 SHA256 efed8260b1799d44b3d313539c7f88761761e665ab38b2740895d6a99405152c SHA512 e9344b99a24fce4c3f2c186108443079fc66b410373170e57d3be04a74678579fd2dcf136344ca820b8b7f75121ef924c4b36e6a2dfa11dc298dabcd8d91fb98 WHIRLPOOL 9add398de7095604a716a2b76f3bd5ce7cd8035304efaaa1a6a60557804c5714160d582a6f768a2024d8f466db31aca10b4028746d450f09c9b6874e893d6442
|
||||
EBUILD openssh-6.0_p1-r1.ebuild 9488 SHA256 f99e6f51f5fc1809cc093e84834699097802d92f8aee712ffcdf1b8548698c08 SHA512 10b19d45b60658e3c61fb74a4c6d4ae1341b4d1129faaa08ec3b655a64f1dc3625ffbe363add33c8e31ac5ebf66cd24415c2324bd5c8d23fad4191e431143be3 WHIRLPOOL 0c35ba4608a5a4fd6c65bfed0f3cde8e8cd7067a94bacf41104c2f0105146a5c79bdec873c2c3a6086637359805ecbb353a2abc9c6e0f2a93a409650aadfff78
|
||||
EBUILD openssh-6.0_p1.ebuild 9485 SHA256 32c4280a8babafa169543a919f4cf31231c3d759a7c116b42e3c3981242c0d59 SHA512 bae20dfbea14cfc30f16c7619d63a4a4cb2546d9d5e903e93e3c4d18745c1398d42ab6580a3e10609d81e1020b8f54c35b6413e168775efd3cb8fab064d67f8a WHIRLPOOL 24d16d37714e69a0d4593b745feeb54853e8d7b2de799be8ed76c0e09fe9459da8a3bfbb67b36f120345fc24fdc307a346c4fcb79b95fd8831e8944383f36759
|
||||
EBUILD openssh-6.1_p1-r1.ebuild 10144 SHA256 d3a9498da4e88e1a90c5d6573152019f681b12e046dfa0b6a0f186b198cf5bcc SHA512 eb4e95964daa6249c87b3589d85f74fa8ba2bef39e65c9886614a4198aecdc4a7924f9c0d8822a0fbf5d47d26f2f201fcee40dcdf5fc9b773ba1bb4400d75f0c WHIRLPOOL b25c79632964123988bfa97b24c063edf566da56501cd20d6da6ac6aa77e1dc33340a528af20ab2d0404e9a4d7876d61d29dd8d38feba3b7cce205a098372565
|
||||
EBUILD openssh-6.1_p1-r1.ebuild 10236 SHA256 575cedb9ed947517d8c934658bb87e37a9d09b986f76c94b937ef5922d861c17 SHA512 04b8f3b995ece67ae6d2a0f1f8c8fda93e408a7f351884cbe89b91470e5d82fbf469184f66cf2db6e11f6e40cbbae049276995e112428da424dcd8e93ecf9444 WHIRLPOOL efb7dc795f7060407843e266f69150ea44f98d3198941f7d21b9bed7e58f697a9c524fcd9b2851af11e119d1e9594e91845d05684c62bce61ba878230c56d250
|
||||
EBUILD openssh-6.1_p1.ebuild 9582 SHA256 e4e060b08be1ae2238889463ad257e6d3b60ccc33c0bd6e5f73e63155795b2cc SHA512 dc3376d4317fe4692b0e3a62acfe7307df0208744dfd35f585eee9768e16493b81dc1ac854f32050dc21470cf1e7681a71c463c4e15a86d8a4b1c99dfdbc83fd WHIRLPOOL d2e7fe4d73ee58318b2b3099d18596db58d2d988e26a1792b9d68dadd3a0fbcda20bf52faf8006913614c995cd7cb7a2e69492c12ede66016639466206fbbc98
|
||||
MISC ChangeLog 75754 SHA256 5fd858c44b140031d196ab18449f5daf74d2c5e5d98d0b4baea7ac61c16f6f15 SHA512 8ad2f358741f793aeee19c674177519c696bc1d39fd61336ae46ce423c05ae8221d1d1acb3ec959fbb821debf210761d95cded53b20d40b5a78d7c325ccab7a2 WHIRLPOOL f79d0e0d6db81f5768b4ee3de42508a7ab25ab3ca666410c63065f525e85ca045e30adad0e36799ce5906fe8d3fd8a27cfb68c13a5e8c321226ea1c2382aab5e
|
||||
MISC ChangeLog 75887 SHA256 b5781f708e796e2ad7cdb7e369248ea70992db5a251996ed13169aba6e23054b SHA512 86c8f9684e755c7e51cd9982657fccaaf46b7bc914105c84ed1485f23ac9f927901a55b09c5f992f0c210f2216484c5598c267db3ba89acc4ea2499483dd5587 WHIRLPOOL e655cdb5922121f9f3444f4b310f91f232700b924304fb178a54132881086c57894718deeee04898f53b015469ab15705346c54b2b31a97a014955dcfe6fdf05
|
||||
MISC metadata.xml 1749 SHA256 efc4abf9bfbc17c1312052e84e77058539851b2e9d0fffb16b2c13bcfda08993 SHA512 18e254f223ddd5bba1b1c4f0ecdd78bffe446a23108bc649d73d8ba626e2940a5a9c5878ab1f8b2689434876e76260fe5a9970649a1287f51033862cf0d5ce36 WHIRLPOOL acb0ce741349f25dbfd58a02a72f5ca45a42ba5441b96766a91b381ed9735efe5105fd6dfaf576bf2dfdd4ef0ed542f81601d74378bc526aac9c0165672dffac
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlElsOcACgkQ/ejvha5XGaNpPgCfWa0l571A+CYVXmmJYjM9A4XI
|
||||
eaUAn37drG7hn008BqgecRO5CDUSD5io
|
||||
=gm+j
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,130 +0,0 @@
|
||||
http://bugs.gentoo.org/43593
|
||||
http://bugzilla.mindrot.org/show_bug.cgi?id=608
|
||||
|
||||
Index: scard-opensc.c
|
||||
===================================================================
|
||||
RCS file: /cvs/openssh/scard-opensc.c,v
|
||||
retrieving revision 1.12
|
||||
--- scard-opensc.c
|
||||
+++ scard-opensc.c
|
||||
@@ -38,6 +38,8 @@
|
||||
#include "readpass.h"
|
||||
#include "scard.h"
|
||||
|
||||
+int ask_for_pin=0;
|
||||
+
|
||||
#if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE)
|
||||
#define USE_ENGINE
|
||||
#define RSA_get_default_method RSA_get_default_openssl_method
|
||||
@@ -119,6 +121,7 @@
|
||||
struct sc_pkcs15_prkey_info *key;
|
||||
struct sc_pkcs15_object *pin_obj;
|
||||
struct sc_pkcs15_pin_info *pin;
|
||||
+ char *passphrase = NULL;
|
||||
|
||||
priv = (struct sc_priv_data *) RSA_get_app_data(rsa);
|
||||
if (priv == NULL)
|
||||
@@ -156,24 +159,47 @@
|
||||
goto err;
|
||||
}
|
||||
pin = pin_obj->data;
|
||||
+
|
||||
+ if (sc_pin)
|
||||
+ passphrase = sc_pin;
|
||||
+ else if (ask_for_pin) {
|
||||
+ /* we need a pin but don't have one => ask for the pin */
|
||||
+ char prompt[64];
|
||||
+
|
||||
+ snprintf(prompt, sizeof(prompt), "Enter PIN for %s: ",
|
||||
+ key_obj->label ? key_obj->label : "smartcard key");
|
||||
+ passphrase = read_passphrase(prompt, 0);
|
||||
+ if (!passphrase || !strcmp(passphrase, ""))
|
||||
+ goto err;
|
||||
+ } else
|
||||
+ /* no pin => error */
|
||||
+ goto err;
|
||||
+
|
||||
r = sc_lock(card);
|
||||
if (r) {
|
||||
error("Unable to lock smartcard: %s", sc_strerror(r));
|
||||
goto err;
|
||||
}
|
||||
- if (sc_pin != NULL) {
|
||||
- r = sc_pkcs15_verify_pin(p15card, pin, sc_pin,
|
||||
- strlen(sc_pin));
|
||||
- if (r) {
|
||||
- sc_unlock(card);
|
||||
- error("PIN code verification failed: %s",
|
||||
- sc_strerror(r));
|
||||
- goto err;
|
||||
- }
|
||||
+ r = sc_pkcs15_verify_pin(p15card, pin, passphrase,
|
||||
+ strlen(passphrase));
|
||||
+ if (r) {
|
||||
+ sc_unlock(card);
|
||||
+ error("PIN code verification failed: %s",
|
||||
+ sc_strerror(r));
|
||||
+ goto err;
|
||||
}
|
||||
+
|
||||
*key_obj_out = key_obj;
|
||||
+ if (!sc_pin) {
|
||||
+ memset(passphrase, 0, strlen(passphrase));
|
||||
+ xfree(passphrase);
|
||||
+ }
|
||||
return 0;
|
||||
err:
|
||||
+ if (!sc_pin && passphrase) {
|
||||
+ memset(passphrase, 0, strlen(passphrase));
|
||||
+ xfree(passphrase);
|
||||
+ }
|
||||
sc_close();
|
||||
return -1;
|
||||
}
|
||||
Index: scard.c
|
||||
===================================================================
|
||||
RCS file: /cvs/openssh/scard.c,v
|
||||
retrieving revision 1.27
|
||||
--- scard.c
|
||||
+++ scard.c
|
||||
@@ -35,6 +35,9 @@
|
||||
#include "readpass.h"
|
||||
#include "scard.h"
|
||||
|
||||
+/* currently unused */
|
||||
+int ask_for_pin = 0;
|
||||
+
|
||||
#if OPENSSL_VERSION_NUMBER < 0x00907000L
|
||||
#define USE_ENGINE
|
||||
#define RSA_get_default_method RSA_get_default_openssl_method
|
||||
Index: scard.h
|
||||
===================================================================
|
||||
RCS file: /cvs/openssh/scard.h,v
|
||||
retrieving revision 1.10
|
||||
--- scard.h
|
||||
+++ scard.h
|
||||
@@ -33,6 +33,8 @@
|
||||
#define SCARD_ERROR_NOCARD -2
|
||||
#define SCARD_ERROR_APPLET -3
|
||||
|
||||
+extern int ask_for_pin;
|
||||
+
|
||||
Key **sc_get_keys(const char *, const char *);
|
||||
void sc_close(void);
|
||||
int sc_put_key(Key *, const char *);
|
||||
Index: ssh.c
|
||||
===================================================================
|
||||
RCS file: /cvs/openssh/ssh.c,v
|
||||
retrieving revision 1.180
|
||||
--- ssh.c
|
||||
+++ ssh.c
|
||||
@@ -1155,6 +1155,9 @@
|
||||
#ifdef SMARTCARD
|
||||
Key **keys;
|
||||
|
||||
+ if (!options.batch_mode)
|
||||
+ ask_for_pin = 1;
|
||||
+
|
||||
if (options.smartcard_device != NULL &&
|
||||
options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
|
||||
(keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) {
|
||||
@ -1,54 +0,0 @@
|
||||
allow ldap and hpn patches to play nice
|
||||
|
||||
--- servconf.c
|
||||
+++ servconf.c
|
||||
@@ -116,24 +116,6 @@
|
||||
options->num_allow_groups = 0;
|
||||
options->num_deny_groups = 0;
|
||||
options->ciphers = NULL;
|
||||
- options->macs = NULL;
|
||||
- options->protocol = SSH_PROTO_UNKNOWN;
|
||||
- options->gateway_ports = -1;
|
||||
- options->num_subsystems = 0;
|
||||
- options->max_startups_begin = -1;
|
||||
- options->max_startups_rate = -1;
|
||||
- options->max_startups = -1;
|
||||
- options->max_authtries = -1;
|
||||
- options->banner = NULL;
|
||||
- options->use_dns = -1;
|
||||
- options->client_alive_interval = -1;
|
||||
- options->client_alive_count_max = -1;
|
||||
- options->authorized_keys_file = NULL;
|
||||
- options->authorized_keys_file2 = NULL;
|
||||
- options->num_accept_env = 0;
|
||||
- options->permit_tun = -1;
|
||||
- options->num_permitted_opens = -1;
|
||||
- options->adm_forced_command = NULL;
|
||||
#ifdef WITH_LDAP_PUBKEY
|
||||
/* XXX dirty */
|
||||
options->lpk.ld = NULL;
|
||||
@@ -152,6 +134,24 @@
|
||||
options->lpk.flags = FLAG_EMPTY;
|
||||
#endif
|
||||
|
||||
+ options->macs = NULL;
|
||||
+ options->protocol = SSH_PROTO_UNKNOWN;
|
||||
+ options->gateway_ports = -1;
|
||||
+ options->num_subsystems = 0;
|
||||
+ options->max_startups_begin = -1;
|
||||
+ options->max_startups_rate = -1;
|
||||
+ options->max_startups = -1;
|
||||
+ options->max_authtries = -1;
|
||||
+ options->banner = NULL;
|
||||
+ options->use_dns = -1;
|
||||
+ options->client_alive_interval = -1;
|
||||
+ options->client_alive_count_max = -1;
|
||||
+ options->authorized_keys_file = NULL;
|
||||
+ options->authorized_keys_file2 = NULL;
|
||||
+ options->num_accept_env = 0;
|
||||
+ options->permit_tun = -1;
|
||||
+ options->num_permitted_opens = -1;
|
||||
+ options->adm_forced_command = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
@ -1,11 +0,0 @@
|
||||
diff -purN openssh-4.7p1.orig/configure.ac openssh-4.7p1/configure.ac
|
||||
--- openssh-4.7p1.orig/configure.ac 2007-08-10 00:36:12.000000000 -0400
|
||||
+++ openssh-4.7p1/configure.ac 2008-03-31 19:38:54.548935620 -0400
|
||||
@@ -3211,6 +3211,7 @@ AC_ARG_WITH(selinux,
|
||||
AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
|
||||
AC_MSG_ERROR(SELinux support requires libselinux library))
|
||||
SSHDLIBS="$SSHDLIBS $LIBSELINUX"
|
||||
+ LIBS="$LIBS $LIBSELINUX"
|
||||
AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
|
||||
LIBS="$save_LIBS"
|
||||
fi ]
|
||||
@ -1,91 +0,0 @@
|
||||
move things around so hpn applies cleanly when using X509
|
||||
|
||||
--- servconf.c
|
||||
+++ servconf.c
|
||||
@@ -106,6 +106,17 @@
|
||||
options->log_level = SYSLOG_LEVEL_NOT_SET;
|
||||
options->rhosts_rsa_authentication = -1;
|
||||
options->hostbased_authentication = -1;
|
||||
+ options->hostbased_algorithms = NULL;
|
||||
+ options->pubkey_algorithms = NULL;
|
||||
+ ssh_x509flags_initialize(&options->x509flags, 1);
|
||||
+#ifndef SSH_X509STORE_DISABLED
|
||||
+ ssh_x509store_initialize(&options->ca);
|
||||
+#endif /*ndef SSH_X509STORE_DISABLED*/
|
||||
+#ifdef SSH_OCSP_ENABLED
|
||||
+ options->va.type = -1;
|
||||
+ options->va.certificate_file = NULL;
|
||||
+ options->va.responder_url = NULL;
|
||||
+#endif /*def SSH_OCSP_ENABLED*/
|
||||
options->hostbased_uses_name_from_packet_only = -1;
|
||||
options->rsa_authentication = -1;
|
||||
options->pubkey_authentication = -1;
|
||||
@@ -147,18 +158,6 @@
|
||||
options->num_permitted_opens = -1;
|
||||
options->adm_forced_command = NULL;
|
||||
options->chroot_directory = NULL;
|
||||
-
|
||||
- options->hostbased_algorithms = NULL;
|
||||
- options->pubkey_algorithms = NULL;
|
||||
- ssh_x509flags_initialize(&options->x509flags, 1);
|
||||
-#ifndef SSH_X509STORE_DISABLED
|
||||
- ssh_x509store_initialize(&options->ca);
|
||||
-#endif /*ndef SSH_X509STORE_DISABLED*/
|
||||
-#ifdef SSH_OCSP_ENABLED
|
||||
- options->va.type = -1;
|
||||
- options->va.certificate_file = NULL;
|
||||
- options->va.responder_url = NULL;
|
||||
-#endif /*def SSH_OCSP_ENABLED*/
|
||||
}
|
||||
|
||||
void
|
||||
@@ -329,6 +329,16 @@
|
||||
/* Portable-specific options */
|
||||
sUsePAM,
|
||||
/* Standard Options */
|
||||
+ sHostbasedAlgorithms,
|
||||
+ sPubkeyAlgorithms,
|
||||
+ sX509KeyAlgorithm,
|
||||
+ sAllowedClientCertPurpose,
|
||||
+ sKeyAllowSelfIssued, sMandatoryCRL,
|
||||
+ sCACertificateFile, sCACertificatePath,
|
||||
+ sCARevocationFile, sCARevocationPath,
|
||||
+ sCAldapVersion, sCAldapURL,
|
||||
+ sVAType, sVACertificateFile,
|
||||
+ sVAOCSPResponderURL,
|
||||
sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
|
||||
sPermitRootLogin, sLogFacility, sLogLevel,
|
||||
sRhostsRSAAuthentication, sRSAAuthentication,
|
||||
@@ -351,16 +361,6 @@
|
||||
sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
|
||||
sMatch, sPermitOpen, sForceCommand,
|
||||
sUsePrivilegeSeparation,
|
||||
- sHostbasedAlgorithms,
|
||||
- sPubkeyAlgorithms,
|
||||
- sX509KeyAlgorithm,
|
||||
- sAllowedClientCertPurpose,
|
||||
- sKeyAllowSelfIssued, sMandatoryCRL,
|
||||
- sCACertificateFile, sCACertificatePath,
|
||||
- sCARevocationFile, sCARevocationPath,
|
||||
- sCAldapVersion, sCAldapURL,
|
||||
- sVAType, sVACertificateFile,
|
||||
- sVAOCSPResponderURL,
|
||||
sDeprecated, sUnsupported
|
||||
} ServerOpCodes;
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -44,11 +44,12 @@
|
||||
CC=@CC@
|
||||
LD=@LD@
|
||||
CFLAGS=@CFLAGS@
|
||||
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
|
||||
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
|
||||
LIBS=@LIBS@
|
||||
SSHDLIBS=@SSHDLIBS@
|
||||
LIBEDIT=@LIBEDIT@
|
||||
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
|
||||
+CPPFLAGS += @LDAP_CPPFLAGS@
|
||||
AR=@AR@
|
||||
AWK=@AWK@
|
||||
RANLIB=@RANLIB@
|
||||
@ -1,21 +0,0 @@
|
||||
a simple 'int main(){}' function won't generate references to SSP functions
|
||||
when using -fstack-protector which means systems that dont have SSP support
|
||||
wont get properly detected as lacking support. instead, create a big buffer
|
||||
on the stack and use it as that seems to do the trick.
|
||||
|
||||
https://bugzilla.mindrot.org/show_bug.cgi?id=1538
|
||||
https://bugs.gentoo.org/244776
|
||||
|
||||
--- openssh-5.1p1/configure.ac
|
||||
+++ openssh-5.1p1/configure.ac
|
||||
@@ -145,8 +145,8 @@ int main(void){return 0;}
|
||||
AC_MSG_CHECKING(if $t works)
|
||||
AC_RUN_IFELSE(
|
||||
[AC_LANG_SOURCE([
|
||||
-#include <stdlib.h>
|
||||
-int main(void){exit(0);}
|
||||
+#include <stdio.h>
|
||||
+int main(void){char foo[[1024]];return sprintf(foo, "moo cow") == 7;}
|
||||
])],
|
||||
[ AC_MSG_RESULT(yes)
|
||||
break ],
|
||||
@ -1,18 +0,0 @@
|
||||
don't escape the banner output
|
||||
|
||||
http://bugs.gentoo.org/244222
|
||||
https://bugzilla.mindrot.org/show_bug.cgi?id=1533
|
||||
|
||||
fix by Michał Górny <mgorny.3ehbo@mailnull.com>
|
||||
|
||||
--- sshconnect2.c
|
||||
+++ sshconnect2.c
|
||||
@@ -415,7 +415,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
|
||||
if (len > 65536)
|
||||
len = 65536;
|
||||
msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
|
||||
- strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
|
||||
+ strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH);
|
||||
fprintf(stderr, "%s", msg);
|
||||
xfree(msg);
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.1p1+lpk/servconf.c openssh-5.1p1+lpk+glue/servconf.c
|
||||
--- openssh-5.1p1+lpk/servconf.c 2008-08-23 14:37:18.000000000 -0700
|
||||
+++ openssh-5.1p1+lpk+glue/servconf.c 2008-08-23 14:52:19.000000000 -0700
|
||||
@@ -111,6 +111,25 @@
|
||||
options->num_allow_groups = 0;
|
||||
options->num_deny_groups = 0;
|
||||
options->ciphers = NULL;
|
||||
+#ifdef WITH_LDAP_PUBKEY
|
||||
+ /* XXX dirty */
|
||||
+ options->lpk.ld = NULL;
|
||||
+ options->lpk.on = -1;
|
||||
+ options->lpk.servers = NULL;
|
||||
+ options->lpk.u_basedn = NULL;
|
||||
+ options->lpk.g_basedn = NULL;
|
||||
+ options->lpk.binddn = NULL;
|
||||
+ options->lpk.bindpw = NULL;
|
||||
+ options->lpk.sgroup = NULL;
|
||||
+ options->lpk.filter = NULL;
|
||||
+ options->lpk.fgroup = NULL;
|
||||
+ options->lpk.l_conf = NULL;
|
||||
+ options->lpk.tls = -1;
|
||||
+ options->lpk.b_timeout.tv_sec = -1;
|
||||
+ options->lpk.s_timeout.tv_sec = -1;
|
||||
+ options->lpk.flags = FLAG_EMPTY;
|
||||
+#endif
|
||||
+
|
||||
options->macs = NULL;
|
||||
options->protocol = SSH_PROTO_UNKNOWN;
|
||||
options->gateway_ports = -1;
|
||||
@@ -131,25 +150,6 @@
|
||||
options->num_permitted_opens = -1;
|
||||
options->adm_forced_command = NULL;
|
||||
options->chroot_directory = NULL;
|
||||
-#ifdef WITH_LDAP_PUBKEY
|
||||
- /* XXX dirty */
|
||||
- options->lpk.ld = NULL;
|
||||
- options->lpk.on = -1;
|
||||
- options->lpk.servers = NULL;
|
||||
- options->lpk.u_basedn = NULL;
|
||||
- options->lpk.g_basedn = NULL;
|
||||
- options->lpk.binddn = NULL;
|
||||
- options->lpk.bindpw = NULL;
|
||||
- options->lpk.sgroup = NULL;
|
||||
- options->lpk.filter = NULL;
|
||||
- options->lpk.fgroup = NULL;
|
||||
- options->lpk.l_conf = NULL;
|
||||
- options->lpk.tls = -1;
|
||||
- options->lpk.b_timeout.tv_sec = -1;
|
||||
- options->lpk.s_timeout.tv_sec = -1;
|
||||
- options->lpk.flags = FLAG_EMPTY;
|
||||
-#endif
|
||||
-
|
||||
}
|
||||
|
||||
void
|
||||
@ -1,35 +0,0 @@
|
||||
apply fixes from upstream for empty banner
|
||||
|
||||
https://bugzilla.mindrot.org/show_bug.cgi?id=1496
|
||||
http://bugs.gentoo.org/244222
|
||||
|
||||
----------------------------
|
||||
revision 1.168
|
||||
date: 2008/10/03 23:56:28; author: deraadt; state: Exp; lines: +3 -3
|
||||
Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the
|
||||
function.
|
||||
spotted by des@freebsd, who commited an incorrect fix to the freebsd tree
|
||||
and (as is fairly typical) did not report the problem to us. But this fix
|
||||
is correct.
|
||||
ok djm
|
||||
----------------------------
|
||||
revision 1.167
|
||||
date: 2008/07/31 14:48:28; author: markus; state: Exp; lines: +2 -2
|
||||
don't allocate space for empty banners; report t8m at centrum.cz; ok deraadt
|
||||
--- src/usr.bin/ssh/sshconnect2.c 2008/07/17 09:48:00 1.166
|
||||
+++ src/usr.bin/ssh/sshconnect2.c 2008/10/04 00:56:28 1.168
|
||||
@@ -377,11 +377,11 @@ input_userauth_banner(int type, u_int32_t seq, void *c
|
||||
debug3("input_userauth_banner");
|
||||
raw = packet_get_string(&len);
|
||||
lang = packet_get_string(NULL);
|
||||
- if (options.log_level >= SYSLOG_LEVEL_INFO) {
|
||||
+ if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) {
|
||||
if (len > 65536)
|
||||
len = 65536;
|
||||
- msg = xmalloc(len * 4); /* max expansion from strnvis() */
|
||||
- strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
|
||||
+ msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
|
||||
+ strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
|
||||
fprintf(stderr, "%s", msg);
|
||||
xfree(msg);
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
need strsep() prototype for 64bit systems
|
||||
|
||||
http://bugs.gentoo.org/258795
|
||||
|
||||
--- a/auth2-pubkey.c
|
||||
+++ b/auth2-pubkey.c
|
||||
@@ -54,6 +54,7 @@
|
||||
#endif
|
||||
#include "monitor_wrap.h"
|
||||
#include "ssh-x509.h"
|
||||
+#include <string.h>
|
||||
#include "misc.h"
|
||||
|
||||
/* import */
|
||||
@ -1,96 +0,0 @@
|
||||
Move things around so hpn applies cleanly when using X509.
|
||||
|
||||
Forward-Ported-from: files/openssh-4.9_p1-x509-hpn-glue.patch
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/Makefile.in openssh-5.1p1+x509-hpn-glue/Makefile.in
|
||||
--- openssh-5.1p1+x509/Makefile.in 2008-08-23 14:12:53.000000000 -0700
|
||||
+++ openssh-5.1p1+x509-hpn-glue/Makefile.in 2008-08-23 14:13:51.000000000 -0700
|
||||
@@ -44,11 +44,12 @@
|
||||
CC=@CC@
|
||||
LD=@LD@
|
||||
CFLAGS=@CFLAGS@
|
||||
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
|
||||
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
|
||||
LIBS=@LIBS@
|
||||
SSHDLIBS=@SSHDLIBS@
|
||||
LIBEDIT=@LIBEDIT@
|
||||
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
|
||||
+CPPFLAGS += @LDAP_CPPFLAGS@
|
||||
AR=@AR@
|
||||
AWK=@AWK@
|
||||
RANLIB=@RANLIB@
|
||||
diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/servconf.c openssh-5.1p1+x509-hpn-glue/servconf.c
|
||||
--- openssh-5.1p1+x509/servconf.c 2008-08-23 14:12:53.000000000 -0700
|
||||
+++ openssh-5.1p1+x509-hpn-glue/servconf.c 2008-08-23 14:23:56.000000000 -0700
|
||||
@@ -108,6 +108,17 @@
|
||||
options->log_level = SYSLOG_LEVEL_NOT_SET;
|
||||
options->rhosts_rsa_authentication = -1;
|
||||
options->hostbased_authentication = -1;
|
||||
+ options->hostbased_algorithms = NULL;
|
||||
+ options->pubkey_algorithms = NULL;
|
||||
+ ssh_x509flags_initialize(&options->x509flags, 1);
|
||||
+#ifndef SSH_X509STORE_DISABLED
|
||||
+ ssh_x509store_initialize(&options->ca);
|
||||
+#endif /*ndef SSH_X509STORE_DISABLED*/
|
||||
+#ifdef SSH_OCSP_ENABLED
|
||||
+ options->va.type = -1;
|
||||
+ options->va.certificate_file = NULL;
|
||||
+ options->va.responder_url = NULL;
|
||||
+#endif /*def SSH_OCSP_ENABLED*/
|
||||
options->hostbased_uses_name_from_packet_only = -1;
|
||||
options->rsa_authentication = -1;
|
||||
options->pubkey_authentication = -1;
|
||||
@@ -151,18 +162,6 @@
|
||||
options->num_permitted_opens = -1;
|
||||
options->adm_forced_command = NULL;
|
||||
options->chroot_directory = NULL;
|
||||
-
|
||||
- options->hostbased_algorithms = NULL;
|
||||
- options->pubkey_algorithms = NULL;
|
||||
- ssh_x509flags_initialize(&options->x509flags, 1);
|
||||
-#ifndef SSH_X509STORE_DISABLED
|
||||
- ssh_x509store_initialize(&options->ca);
|
||||
-#endif /*ndef SSH_X509STORE_DISABLED*/
|
||||
-#ifdef SSH_OCSP_ENABLED
|
||||
- options->va.type = -1;
|
||||
- options->va.certificate_file = NULL;
|
||||
- options->va.responder_url = NULL;
|
||||
-#endif /*def SSH_OCSP_ENABLED*/
|
||||
}
|
||||
|
||||
void
|
||||
@@ -338,6 +337,16 @@
|
||||
/* Portable-specific options */
|
||||
sUsePAM,
|
||||
/* Standard Options */
|
||||
+ sHostbasedAlgorithms,
|
||||
+ sPubkeyAlgorithms,
|
||||
+ sX509KeyAlgorithm,
|
||||
+ sAllowedClientCertPurpose,
|
||||
+ sKeyAllowSelfIssued, sMandatoryCRL,
|
||||
+ sCACertificateFile, sCACertificatePath,
|
||||
+ sCARevocationFile, sCARevocationPath,
|
||||
+ sCAldapVersion, sCAldapURL,
|
||||
+ sVAType, sVACertificateFile,
|
||||
+ sVAOCSPResponderURL,
|
||||
sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
|
||||
sPermitRootLogin, sLogFacility, sLogLevel,
|
||||
sRhostsRSAAuthentication, sRSAAuthentication,
|
||||
@@ -360,16 +369,6 @@
|
||||
sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
|
||||
sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
|
||||
sUsePrivilegeSeparation, sAllowAgentForwarding,
|
||||
- sHostbasedAlgorithms,
|
||||
- sPubkeyAlgorithms,
|
||||
- sX509KeyAlgorithm,
|
||||
- sAllowedClientCertPurpose,
|
||||
- sKeyAllowSelfIssued, sMandatoryCRL,
|
||||
- sCACertificateFile, sCACertificatePath,
|
||||
- sCARevocationFile, sCARevocationPath,
|
||||
- sCAldapVersion, sCAldapURL,
|
||||
- sVAType, sVACertificateFile,
|
||||
- sVAOCSPResponderURL,
|
||||
sDeprecated, sUnsupported
|
||||
} ServerOpCodes;
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
fix from newer versions for parallel build failures
|
||||
|
||||
http://crosbug.com/31285
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -149,7 +149,7 @@
|
||||
ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
|
||||
$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
||||
|
||||
-ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
|
||||
+ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o
|
||||
$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
||||
|
||||
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Nuar openssh-5.3p1/Makefile.in openssh-5.3p1.pkcs-hpn-glue/Makefile.in
|
||||
--- openssh-5.3p1/Makefile.in 2009-10-10 22:52:10.081356354 -0700
|
||||
+++ openssh-5.3p1.pkcs-hpn-glue/Makefile.in 2009-10-10 22:55:47.158418049 -0700
|
||||
@@ -64,10 +64,10 @@
|
||||
|
||||
LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
|
||||
canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
|
||||
- pkcs11.o \
|
||||
cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
|
||||
compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
|
||||
log.o match.o md-sha256.o moduli.o nchan.o packet.o \
|
||||
+ pkcs11.o \
|
||||
readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
|
||||
atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
|
||||
monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1-r1.ebuild,v 1.4 2013/01/22 02:51:55 robbat2 Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1-r1.ebuild,v 1.5 2013/02/21 05:30:13 zmedico Exp $
|
||||
|
||||
EAPI="4"
|
||||
inherit eutils user flag-o-matic multilib autotools pam systemd versionator
|
||||
@ -23,7 +23,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
|
||||
|
||||
LICENSE="BSD GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap ldns libedit pam selinux skey static tcpd X X509"
|
||||
|
||||
LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
|
||||
@ -89,7 +89,7 @@ save_version() {
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
|
||||
-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:' \
|
||||
pathnames.h || die
|
||||
# keep this as we need it to avoid the conflict between LPK and HPN changing
|
||||
# this file.
|
||||
@ -183,11 +183,11 @@ src_configure() {
|
||||
econf \
|
||||
--with-ldflags="${LDFLAGS}" \
|
||||
--disable-strip \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/ssh \
|
||||
--libexecdir=/usr/$(get_libdir)/misc \
|
||||
--datadir=/usr/share/openssh \
|
||||
--with-privsep-path=/var/empty \
|
||||
--with-pid-dir="${EPREFIX}"/var/run \
|
||||
--sysconfdir="${EPREFIX}"/etc/ssh \
|
||||
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc \
|
||||
--datadir="${EPREFIX}"/usr/share/openssh \
|
||||
--with-privsep-path="${EPREFIX}"/var/empty \
|
||||
--with-privsep-user=sshd \
|
||||
--with-md5-passwords \
|
||||
--with-ssl-engine \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user