Revision: 5582 Author: pebender Date: Thu Oct 1 07:22:39 2009 Log: - Updated package net/openssh.
http://code.google.com/p/minimyth/source/detail?r=5582 Added: /trunk/gar-minimyth/script/net/openssh/files/openssh-5.3p1-abstract_socket.patch /trunk/gar-minimyth/script/net/openssh/files/openssh-5.3p1.patch Deleted: /trunk/gar-minimyth/script/net/openssh/files/openssh-5.2p1-abstract_socket.patch /trunk/gar-minimyth/script/net/openssh/files/openssh-5.2p1.patch Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/net/openssh/Makefile /trunk/gar-minimyth/script/net/openssh/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/net/openssh/files/openssh-5.3p1-abstract_socket.patch Thu Oct 1 07:22:39 2009 @@ -0,0 +1,49 @@ +diff -Naur openssh-5.3p1-old/channels.c openssh-5.3p1-new/channels.c +--- openssh-5.3p1-old/channels.c 2009-08-27 18:02:37.000000000 -0700 ++++ openssh-5.3p1-new/channels.c 2009-10-01 07:18:56.000000000 -0700 +@@ -60,6 +60,7 @@ + #include <termios.h> + #include <unistd.h> + #include <stdarg.h> ++#include <stddef.h> + + #include "openbsd-compat/sys-queue.h" + #include "xmalloc.h" +@@ -3172,6 +3173,8 @@ + { + int sock; + struct sockaddr_un addr; ++ int abstract = 0; ++ int addrsize = 0; + + sock = socket(AF_UNIX, SOCK_STREAM, 0); + if (sock < 0) +@@ -3179,8 +3182,15 @@ + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strlcpy(addr.sun_path, pathname, sizeof addr.sun_path); +- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) ++ addrsize = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); ++ if (addr.sun_path[0] = '@') ++ abstract = 1; ++ if (abstract) ++ addr.sun_path[0] = '\0'; ++ if (connect(sock, (struct sockaddr *)&addr, addrsize) == 0) + return sock; ++ if (abstract) ++ addr.sun_path[0] = '@'; + close(sock); + error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); + return -1; +diff -Naur openssh-5.3p1-old/defines.h openssh-5.3p1-new/defines.h +--- openssh-5.3p1-old/defines.h 2009-08-27 18:21:07.000000000 -0700 ++++ openssh-5.3p1-new/defines.h 2009-10-01 07:18:56.000000000 -0700 +@@ -370,7 +370,7 @@ + # ifdef __hpux + # define X_UNIX_PATH "/var/spool/sockets/X11/%u" + # else +-# define X_UNIX_PATH "/tmp/.X11-unix/X%u" ++# define X_UNIX_PATH "@/tmp/.X11-unix/X%u" + # endif + #endif /* X_UNIX_PATH */ + #define _PATH_UNIX_X X_UNIX_PATH ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/net/openssh/files/openssh-5.3p1.patch Thu Oct 1 07:22:39 2009 @@ -0,0 +1,53 @@ +diff -Naur openssh-5.3p1-old/configure.ac openssh-5.3p1-new/configure.ac +--- openssh-5.3p1-old/configure.ac 2009-10-01 07:18:49.000000000 -0700 ++++ openssh-5.3p1-new/configure.ac 2009-10-01 07:19:52.000000000 -0700 +@@ -29,7 +29,7 @@ + AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_EGREP +-AC_PATH_PROG(AR, ar) ++AC_PATH_TOOL(AR, ar) + AC_PATH_PROG(CAT, cat) + AC_PATH_PROG(KILL, kill) + AC_PATH_PROGS(PERL, perl5 perl) +@@ -1110,25 +1110,25 @@ + + AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>]) + +-AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ ++AC_CACHE_CHECK( ++ [whether struct dirent allocates space for d_name], ++ [ac_cv_have_space_for_dirent_d_name], ++ [AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([[ + #include <sys/types.h> + #include <dirent.h> + int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} +- ]])], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, +- [Define if your struct dirent expects you to +- allocate extra space for d_name]) +- ], +- [ +- AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME]) +- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) +- ] ++ ]])], ++ [ ac_cv_have_space_for_dirent_d_name="yes" ], ++ [ ac_cv_have_space_for_dirent_d_name="no" ], ++ [ ac_cv_have_space_for_dirent_d_name="no" ] ++ )] + ) ++if test "x$ac_cv_have_space_for_dirent_d_name" = "xno" ; then ++ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, ++ [Define if your struct dirent expects you to ++ allocate extra space for d_name]) ++fi + + AC_MSG_CHECKING([for /proc/pid/fd directory]) + if test -d "/proc/$$/fd" ; then ======================================= --- /trunk/gar-minimyth/script/net/openssh/files/openssh-5.2p1-abstract_socket.patch Tue Jun 23 15:01:54 2009 +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur openssh-5.2p1-old/channels.c openssh-5.2p1-new/channels.c ---- openssh-5.2p1-old/channels.c 2009-02-13 21:28:21.000000000 -0800 -+++ openssh-5.2p1-new/channels.c 2009-06-23 14:31:45.000000000 -0700 -@@ -60,6 +60,7 @@ - #include <termios.h> - #include <unistd.h> - #include <stdarg.h> -+#include <stddef.h> - - #include "openbsd-compat/sys-queue.h" - #include "xmalloc.h" -@@ -3170,6 +3171,8 @@ - { - int sock; - struct sockaddr_un addr; -+ int abstract = 0; -+ int addrsize = 0; - - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock < 0) -@@ -3177,8 +3180,15 @@ - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - strlcpy(addr.sun_path, pathname, sizeof addr.sun_path); -- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) -+ addrsize = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); -+ if (addr.sun_path[0] = '@') -+ abstract = 1; -+ if (abstract) -+ addr.sun_path[0] = '\0'; -+ if (connect(sock, (struct sockaddr *)&addr, addrsize) == 0) - return sock; -+ if (abstract) -+ addr.sun_path[0] = '@'; - close(sock); - error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); - return -1; -diff -Naur openssh-5.2p1-old/defines.h openssh-5.2p1-new/defines.h ---- openssh-5.2p1-old/defines.h 2009-02-01 03:19:54.000000000 -0800 -+++ openssh-5.2p1-new/defines.h 2009-06-23 14:31:24.000000000 -0700 -@@ -367,7 +367,7 @@ - # ifdef __hpux - # define X_UNIX_PATH "/var/spool/sockets/X11/%u" - # else --# define X_UNIX_PATH "/tmp/.X11-unix/X%u" -+# define X_UNIX_PATH "@/tmp/.X11-unix/X%u" - # endif - #endif /* X_UNIX_PATH */ - #define _PATH_UNIX_X X_UNIX_PATH ======================================= --- /trunk/gar-minimyth/script/net/openssh/files/openssh-5.2p1.patch Fri Feb 27 21:33:40 2009 +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur openssh-5.2p1-old/configure.ac openssh-5.2p1-new/configure.ac ---- openssh-5.2p1-old/configure.ac 2009-02-15 20:37:03.000000000 -0800 -+++ openssh-5.2p1-new/configure.ac 2009-02-26 08:20:12.000000000 -0800 -@@ -29,7 +29,7 @@ - AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PROG_EGREP --AC_PATH_PROG(AR, ar) -+AC_PATH_TOOL(AR, ar) - AC_PATH_PROG(CAT, cat) - AC_PATH_PROG(KILL, kill) - AC_PATH_PROGS(PERL, perl5 perl) -@@ -1105,25 +1105,25 @@ - - AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>]) - --AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ -+AC_CACHE_CHECK( -+ [whether struct dirent allocates space for d_name], -+ [ac_cv_have_space_for_dirent_d_name], -+ [AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <dirent.h> - int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} -- ]])], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, -- [Define if your struct dirent expects you to -- allocate extra space for d_name]) -- ], -- [ -- AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME]) -- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) -- ] -+ ]])], -+ [ ac_cv_have_space_for_dirent_d_name="yes" ], -+ [ ac_cv_have_space_for_dirent_d_name="no" ], -+ [ ac_cv_have_space_for_dirent_d_name="no" ] -+ )] - ) -+if test "x$ac_cv_have_space_for_dirent_d_name" = "xno" ; then -+ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, -+ [Define if your struct dirent expects you to -+ allocate extra space for d_name]) -+fi - - AC_MSG_CHECKING([for /proc/pid/fd directory]) - if test -d "/proc/$$/fd" ; then ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Sep 30 15:34:28 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Thu Oct 1 07:22:39 2009 @@ -1,7 +1,7 @@ MiniMyth Changelog -------------------------------------------------------------------------------- -Changes since 69 (2009-09-30): +Changes since 69 (2009-10-01): Current MythTV versions MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch svn 16082 and @@ -166,6 +166,7 @@ Updated myth-trunk/mythstream. Updated net/curl. Updated net/mount.cifs. + Updated net/openssh. Updated perl/perl. Updated perl/perl-DBD-mysql. Updated perl/perl-libwww-perl. ======================================= --- /trunk/gar-minimyth/script/net/openssh/Makefile Tue Jun 23 15:01:54 2009 +++ /trunk/gar-minimyth/script/net/openssh/Makefile Thu Oct 1 07:22:39 2009 @@ -1,5 +1,5 @@ GARNAME = openssh -GARVERSION = 5.2p1 +GARVERSION = 5.3p1 CATEGORIES = net MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ MASTER_SITES += ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/old/ ======================================= --- /trunk/gar-minimyth/script/net/openssh/checksums Tue Jun 23 15:01:54 2009 +++ /trunk/gar-minimyth/script/net/openssh/checksums Thu Oct 1 07:22:39 2009 @@ -1,3 +1,3 @@ -ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz -03b065a810047ab6b07013e7e910dff5 download/openssh-5.2p1-abstract_socket.patch -5ecf5a1d448ec48e73e2d2afe14c537d download/openssh-5.2p1.patch +13563dbf61f36ca9a1e4254260131041 download/openssh-5.3p1.tar.gz +249d41c32f924d85660d7827643c0a6d download/openssh-5.3p1-abstract_socket.patch +22bfd8f678862ec453efb50908ad16f1 download/openssh-5.3p1.patch --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
