diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-08-12 15:39:54 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-08-12 15:39:54 +0000 |
commit | cb18c0e05cf2247cfe6ad4c7493d59eb528a5380 (patch) | |
tree | 4f1dd2b04b31f24228c258bd80653b9245a9187b /net-misc | |
parent | White space fixes. (diff) | |
download | gentoo-2-cb18c0e05cf2247cfe6ad4c7493d59eb528a5380.tar.gz gentoo-2-cb18c0e05cf2247cfe6ad4c7493d59eb528a5380.tar.bz2 gentoo-2-cb18c0e05cf2247cfe6ad4c7493d59eb528a5380.zip |
old
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dropbear/dropbear-0.47-r1.ebuild | 74 | ||||
-rw-r--r-- | net-misc/dropbear/dropbear-0.48.1-r1.ebuild | 78 | ||||
-rw-r--r-- | net-misc/dropbear/dropbear-0.48.1.ebuild | 76 | ||||
-rw-r--r-- | net-misc/dropbear/files/digest-dropbear-0.47-r1 | 3 | ||||
-rw-r--r-- | net-misc/dropbear/files/digest-dropbear-0.48.1 | 3 | ||||
-rw-r--r-- | net-misc/dropbear/files/digest-dropbear-0.48.1-r1 | 3 | ||||
-rw-r--r-- | net-misc/dropbear/files/dropbear-0.47-CVE-2006-0225.patch | 302 |
7 files changed, 0 insertions, 539 deletions
diff --git a/net-misc/dropbear/dropbear-0.47-r1.ebuild b/net-misc/dropbear/dropbear-0.47-r1.ebuild deleted file mode 100644 index 826024e4ccfb..000000000000 --- a/net-misc/dropbear/dropbear-0.47-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.47-r1.ebuild,v 1.10 2007/03/26 08:05:13 antarus Exp $ - -inherit eutils - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc s390 sh sparc x86" -IUSE="minimal multicall pam static zlib" - -RDEPEND="zlib? ( sys-libs/zlib ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ssh" - -set_options() { - use minimal \ - && progs="dropbear dbclient dropbearkey" \ - || progs="dropbear dbclient dropbearkey dropbearconvert scp" - use multicall && makeopts="${makeopts} MULTI=1" - use static && makeopts="${makeopts} STATIC=1" -} - -pkg_setup() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/dropbear-0.45-urandom.patch - epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch - epatch "${FILESDIR}"/dropbear-0.47-CVE-2006-0225.patch -} - -src_compile() { - local myconf - # --disable-syslog? wouldn't need logger in init.d - use minimal && myconf="--disable-lastlog" - econf ${myconf} $(use_enable zlib) $(use_enable pam) || die - set_options - emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed" -} - -src_install() { - set_options - make install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed" - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README TODO SMALL MULTI - - # The multi install target does not install the links - if use multicall ; then - cd "${D}"/usr/bin - local x - for x in ${progs} ; do - ln -s dropbearmulti ${x} - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" - fi - - mv "${D}"/usr/bin/{,db}scp -} diff --git a/net-misc/dropbear/dropbear-0.48.1-r1.ebuild b/net-misc/dropbear/dropbear-0.48.1-r1.ebuild deleted file mode 100644 index b6d1899432b4..000000000000 --- a/net-misc/dropbear/dropbear-0.48.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.48.1-r1.ebuild,v 1.2 2007/03/26 08:05:13 antarus Exp $ - -inherit eutils savedconfig - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="minimal multicall pam static zlib" - -RDEPEND="zlib? ( sys-libs/zlib ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ssh" - -set_options() { - use minimal \ - && progs="dropbear dbclient dropbearkey" \ - || progs="dropbear dbclient dropbearkey dropbearconvert scp" - use multicall && makeopts="${makeopts} MULTI=1" - use static && makeopts="${makeopts} STATIC=1" -} - -pkg_setup() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/dropbear-0.45-urandom.patch - epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch - sed -i \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - options.h - restore_config options.h -} - -src_compile() { - local myconf - # --disable-syslog? wouldn't need logger in init.d - use minimal && myconf="--disable-lastlog" - econf ${myconf} $(use_enable zlib) $(use_enable pam) || die - set_options - emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed" -} - -src_install() { - set_options - make install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed" - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README TODO SMALL MULTI - - # The multi install target does not install the links - if use multicall ; then - cd "${D}"/usr/bin - local x - for x in ${progs} ; do - ln -s dropbearmulti ${x} - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" - fi - save_config options.h - - mv "${D}"/usr/bin/{,db}scp -} diff --git a/net-misc/dropbear/dropbear-0.48.1.ebuild b/net-misc/dropbear/dropbear-0.48.1.ebuild deleted file mode 100644 index baa29b344cea..000000000000 --- a/net-misc/dropbear/dropbear-0.48.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.48.1.ebuild,v 1.3 2007/03/26 08:05:13 antarus Exp $ - -inherit eutils - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="minimal multicall pam static zlib" - -RDEPEND="zlib? ( sys-libs/zlib ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ssh" - -set_options() { - use minimal \ - && progs="dropbear dbclient dropbearkey" \ - || progs="dropbear dbclient dropbearkey dropbearconvert scp" - use multicall && makeopts="${makeopts} MULTI=1" - use static && makeopts="${makeopts} STATIC=1" -} - -pkg_setup() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/dropbear-0.45-urandom.patch - epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch - sed -i \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - options.h -} - -src_compile() { - local myconf - # --disable-syslog? wouldn't need logger in init.d - use minimal && myconf="--disable-lastlog" - econf ${myconf} $(use_enable zlib) $(use_enable pam) || die - set_options - emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed" -} - -src_install() { - set_options - make install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed" - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README TODO SMALL MULTI - - # The multi install target does not install the links - if use multicall ; then - cd "${D}"/usr/bin - local x - for x in ${progs} ; do - ln -s dropbearmulti ${x} - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" - fi - - mv "${D}"/usr/bin/{,db}scp -} diff --git a/net-misc/dropbear/files/digest-dropbear-0.47-r1 b/net-misc/dropbear/files/digest-dropbear-0.47-r1 deleted file mode 100644 index c4f853da552f..000000000000 --- a/net-misc/dropbear/files/digest-dropbear-0.47-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cf634614d52278d44dfd9c224a438bf2 dropbear-0.47.tar.bz2 1418374 -RMD160 d36aace7586e76bf21c4b62a090147cebaf85b12 dropbear-0.47.tar.bz2 1418374 -SHA256 8888cf99c10936401b4f47a0d20018f1a006b05d09b2ff5f9d74e6303f9f92a8 dropbear-0.47.tar.bz2 1418374 diff --git a/net-misc/dropbear/files/digest-dropbear-0.48.1 b/net-misc/dropbear/files/digest-dropbear-0.48.1 deleted file mode 100644 index 1887eac5c2f4..000000000000 --- a/net-misc/dropbear/files/digest-dropbear-0.48.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ca8e53a766faec831882831364568421 dropbear-0.48.1.tar.gz 1473114 -RMD160 055740e5978f91ca34d318e6a6f8052d182e8d7c dropbear-0.48.1.tar.gz 1473114 -SHA256 fa6c3567e293fa0aa249db695b9d5e43ef3f8c11bab74a9b42acc9a0a5c96742 dropbear-0.48.1.tar.gz 1473114 diff --git a/net-misc/dropbear/files/digest-dropbear-0.48.1-r1 b/net-misc/dropbear/files/digest-dropbear-0.48.1-r1 deleted file mode 100644 index 1887eac5c2f4..000000000000 --- a/net-misc/dropbear/files/digest-dropbear-0.48.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ca8e53a766faec831882831364568421 dropbear-0.48.1.tar.gz 1473114 -RMD160 055740e5978f91ca34d318e6a6f8052d182e8d7c dropbear-0.48.1.tar.gz 1473114 -SHA256 fa6c3567e293fa0aa249db695b9d5e43ef3f8c11bab74a9b42acc9a0a5c96742 dropbear-0.48.1.tar.gz 1473114 diff --git a/net-misc/dropbear/files/dropbear-0.47-CVE-2006-0225.patch b/net-misc/dropbear/files/dropbear-0.47-CVE-2006-0225.patch deleted file mode 100644 index 5608a05a7916..000000000000 --- a/net-misc/dropbear/files/dropbear-0.47-CVE-2006-0225.patch +++ /dev/null @@ -1,302 +0,0 @@ -Index: misc.c -=================================================================== -RCS file: /cvs/src/usr.bin/ssh/misc.c,v -retrieving revision 1.41 -retrieving revision 1.42 -diff -u -p -r1.41 -r1.42 ---- scpmisc.c 5 Jan 2006 23:43:53 -0000 1.41 -+++ scpmisc.c 31 Jan 2006 10:19:02 -0000 1.42 -@@ -383,12 +383,15 @@ void - addargs(arglist *args, char *fmt, ...) - { - va_list ap; -- char buf[1024]; -+ char *cp; -- int nalloc; -+ u_int nalloc; -+ int r; - - va_start(ap, fmt); -- vsnprintf(buf, sizeof(buf), fmt, ap); -+ r = vasprintf(&cp, fmt, ap); - va_end(ap); -+ if (r == -1) -+ fatal("addargs: argument too long"); - - nalloc = args->nalloc; - if (args->list == NULL) { -@@ -399,6 +402,40 @@ addargs(arglist *args, char *fmt, ...) - - args->list = xrealloc(args->list, nalloc * sizeof(char *)); - args->nalloc = nalloc; -- args->list[args->num++] = xstrdup(buf); -+ args->list[args->num++] = cp; - args->list[args->num] = NULL; -+} -+ -+void -+replacearg(arglist *args, u_int which, char *fmt, ...) -+{ -+ va_list ap; -+ char *cp; -+ int r; -+ -+ va_start(ap, fmt); -+ r = vasprintf(&cp, fmt, ap); -+ va_end(ap); -+ if (r == -1) -+ fatal("replacearg: argument too long"); -+ -+ if (which >= args->num) -+ fatal("replacearg: tried to replace invalid arg %d >= %d", -+ which, args->num); -+ xfree(args->list[which]); -+ args->list[which] = cp; -+} -+ -+void -+freeargs(arglist *args) -+{ -+ u_int i; -+ -+ if (args->list != NULL) { -+ for (i = 0; i < args->num; i++) -+ xfree(args->list[i]); -+ xfree(args->list); -+ args->nalloc = args->num = 0; -+ args->list = NULL; -+ } - } -Index: misc.h -=================================================================== -RCS file: /cvs/src/usr.bin/ssh/misc.h,v -retrieving revision 1.28 -retrieving revision 1.29 -diff -u -p -r1.28 -r1.29 ---- scpmisc.h 8 Dec 2005 18:34:11 -0000 1.28 -+++ scpmisc.h 31 Jan 2006 10:19:02 -0000 1.29 -@@ -38,10 +38,20 @@ struct arglist { - typedef struct arglist arglist; - struct arglist { - char **list; -- int num; -- int nalloc; -+ u_int num; -+ u_int nalloc; - }; --void addargs(arglist *, char *, ...); -+void addargs(arglist *, char *, ...) -+ __attribute__((format(printf, 2, 3))); -+void replacearg(arglist *, u_int, char *, ...) -+ __attribute__((format(printf, 3, 4))); -+void freeargs(arglist *); -+ -+#define fatal(fmt, args...) \ -+ do { \ -+ fprintf(stderr, fmt, ## args); \ -+ exit (255); \ -+ } while (0) - - /* from xmalloc.h */ - void *xmalloc(size_t); -Index: scp.c -=================================================================== -RCS file: /cvs/src/usr.bin/ssh/scp.c,v -retrieving revision 1.128 -retrieving revision 1.129 -diff -u -p -r1.128 -r1.129 ---- scp.c 6 Dec 2005 22:38:27 -0000 1.128 -+++ scp.c 31 Jan 2006 10:19:02 -0000 1.129 -@@ -118,6 +118,48 @@ killchild(int signo) - _exit(1); - } - -+static int -+do_local_cmd(arglist *a) -+{ -+ u_int i; -+ int status; -+ pid_t pid; -+ -+ if (a->num == 0) -+ fatal("do_local_cmd: no arguments"); -+ -+ if (verbose_mode) { -+ fprintf(stderr, "Executing:"); -+ for (i = 0; i < a->num; i++) -+ fprintf(stderr, " %s", a->list[i]); -+ fprintf(stderr, "\n"); -+ } -+ if ((pid = fork()) == -1) -+ fatal("do_local_cmd: fork: %s", strerror(errno)); -+ -+ if (pid == 0) { -+ execvp(a->list[0], a->list); -+ perror(a->list[0]); -+ exit(1); -+ } -+ -+ do_cmd_pid = pid; -+ signal(SIGTERM, killchild); -+ signal(SIGINT, killchild); -+ signal(SIGHUP, killchild); -+ -+ while (waitpid(pid, &status, 0) == -1) -+ if (errno != EINTR) -+ fatal("do_local_cmd: waitpid: %s", strerror(errno)); -+ -+ do_cmd_pid = -1; -+ -+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) -+ return (-1); -+ -+ return (0); -+} -+ - /* - * This function executes the given command as the specified user on the - * given host. This returns < 0 if execution fails, and >= 0 otherwise. This -@@ -162,7 +204,7 @@ do_cmd(char *host, char *remuser, char * - close(pin[0]); - close(pout[1]); - -- args.list[0] = ssh_program; -+ replacearg(&args, 0, "%s", ssh_program); - if (remuser != NULL) { - addargs(&args, "-l"); - addargs(&args, "%s", remuser); -@@ -225,8 +267,9 @@ main(int argc, char **argv) - extern char *optarg; - extern int optind; - -+ memset(&args, '\0', sizeof(args)); - args.list = NULL; -- addargs(&args, "ssh"); /* overwritten with ssh_program */ -+ addargs(&args, "%s", ssh_program); - addargs(&args, "-x"); - addargs(&args, "-oForwardAgent no"); - addargs(&args, "-oClearAllForwardings yes"); -@@ -363,6 +406,10 @@ toremote(char *targ, int argc, char **ar - { - int i, len; - char *bp, *host, *src, *suser, *thost, *tuser; -+ arglist alist; -+ -+ memset(&alist, '\0', sizeof(alist)); -+ alist.list = NULL; - - *targ++ = 0; - if (*targ == 0) -@@ -380,55 +427,46 @@ toremote(char *targ, int argc, char **ar - tuser = NULL; - } - -+ if (tuser != NULL && !okname(tuser)) -+ return; -+ - for (i = 0; i < argc - 1; i++) { - src = colon(argv[i]); - if (src) { /* remote to remote */ -- static char *ssh_options = -- "-x -o'ClearAllForwardings yes'"; -+ freeargs(&alist); -+ addargs(&alist, "%s", ssh_program); -+ if (verbose_mode) -+ addargs(&alist, "-v"); -+ addargs(&alist, "-x"); -+ addargs(&alist, "-oClearAllForwardings yes"); -+ addargs(&alist, "-n"); -+ - *src++ = 0; - if (*src == 0) - src = "."; - host = strrchr(argv[i], '@'); -- len = strlen(ssh_program) + strlen(argv[i]) + -- strlen(src) + (tuser ? strlen(tuser) : 0) + -- strlen(thost) + strlen(targ) + -- strlen(ssh_options) + CMDNEEDS + 20; -- bp = xmalloc(len); -+ - if (host) { - *host++ = 0; - host = cleanhostname(host); - suser = argv[i]; - if (*suser == '\0') - suser = pwd->pw_name; -- else if (!okname(suser)) { -- xfree(bp); -- continue; -- } -- if (tuser && !okname(tuser)) { -- xfree(bp); -+ else if (!okname(suser)) - continue; -- } -- snprintf(bp, len, -- "%s%s %s -n " -- "-l %s %s %s %s '%s%s%s:%s'", -- ssh_program, verbose_mode ? " -v" : "", -- ssh_options, suser, host, cmd, src, -- tuser ? tuser : "", tuser ? "@" : "", -- thost, targ); -+ addargs(&alist, "-l"); -+ addargs(&alist, "%s", suser); - } else { - host = cleanhostname(argv[i]); -- snprintf(bp, len, -- "exec %s%s %s -n %s " -- "%s %s '%s%s%s:%s'", -- ssh_program, verbose_mode ? " -v" : "", -- ssh_options, host, cmd, src, -- tuser ? tuser : "", tuser ? "@" : "", -- thost, targ); - } -- if (verbose_mode) -- fprintf(stderr, "Executing: %s\n", bp); -- (void) system(bp); -+ addargs(&alist, "%s", host); -+ addargs(&alist, "%s", cmd); -+ addargs(&alist, "%s", src); -+ addargs(&alist, "%s%s%s:%s", -+ tuser ? tuser : "", tuser ? "@" : "", -+ thost, targ); -+ if (do_local_cmd(&alist) != 0) -+ errs = 1; -- (void) xfree(bp); - } else { /* local to remote */ - if (remin == -1) { - len = strlen(targ) + CMDNEEDS + 20; -@@ -453,20 +492,23 @@ tolocal(int argc, char **argv) - { - int i, len; - char *bp, *host, *src, *suser; -+ arglist alist; -+ -+ memset(&alist, '\0', sizeof(alist)); -+ alist.list = NULL; - - for (i = 0; i < argc - 1; i++) { - if (!(src = colon(argv[i]))) { /* Local to local. */ -- len = strlen(_PATH_CP) + strlen(argv[i]) + -- strlen(argv[argc - 1]) + 20; -- bp = xmalloc(len); -- (void) snprintf(bp, len, "exec %s%s%s %s %s", _PATH_CP, -- iamrecursive ? " -r" : "", pflag ? " -p" : "", -- argv[i], argv[argc - 1]); -- if (verbose_mode) -- fprintf(stderr, "Executing: %s\n", bp); -- if (system(bp)) -+ freeargs(&alist); -+ addargs(&alist, "%s", _PATH_CP); -+ if (iamrecursive) -+ addargs(&alist, "-r"); -+ if (pflag) -+ addargs(&alist, "-p"); -+ addargs(&alist, "%s", argv[i]); -+ addargs(&alist, "%s", argv[argc-1]); -+ if (do_local_cmd(&alist)) - ++errs; -- (void) xfree(bp); - continue; - } - *src++ = 0; |