diff options
| -rwxr-xr-x | data/openssh/_metadata/extrainst_ (renamed from data/openssh/_metadata/postinst) | 5 | ||||
| -rwxr-xr-x | data/openssh/_metadata/prerm | 5 | ||||
| -rw-r--r-- | data/openssh/_metadata/version | 2 | ||||
| -rw-r--r-- | data/openssh/make.sh | 2 | ||||
| -rw-r--r-- | data/openssh/openssh-5.1p1.tar.gz | bin | 1040041 -> 0 bytes | |||
| -rw-r--r-- | data/openssh/openssh-5.2p1.tar.gz | bin | 0 -> 1016612 bytes | |||
| -rw-r--r-- | data/openssh/utmp.diff | 40 | ||||
| -rw-r--r-- | data/openssl/_metadata/version | 2 | ||||
| -rw-r--r-- | data/openssl/armnm.diff | 12 | ||||
| -rw-r--r-- | data/openssl/openssl-0.9.8i.tar.gz | bin | 3459643 -> 0 bytes | |||
| -rw-r--r-- | data/openssl/openssl-0.9.8k.tar.gz | bin | 0 -> 3852259 bytes |
11 files changed, 51 insertions, 17 deletions
diff --git a/data/openssh/_metadata/postinst b/data/openssh/_metadata/extrainst_ index 4899fcae7..f1e8ec5a3 100755 --- a/data/openssh/_metadata/postinst +++ b/data/openssh/_metadata/extrainst_ @@ -1,4 +1,7 @@ #!/bin/sh -/bin/launchctl list com.openssh.sshd &>/dev/null || + +if [[ $1 == install || $1 == upgrade ]]; then /bin/launchctl load /Library/LaunchDaemons/com.openssh.sshd.plist +fi + exit 0 diff --git a/data/openssh/_metadata/prerm b/data/openssh/_metadata/prerm index 17abc80ef..71be0c498 100755 --- a/data/openssh/_metadata/prerm +++ b/data/openssh/_metadata/prerm @@ -1,4 +1,7 @@ #!/bin/sh -! /bin/launchctl list com.openssh.sshd &>/dev/null || + +if [[ $1 == remove || $1 == purge ]]; then /bin/launchctl unload /Library/LaunchDaemons/com.openssh.sshd.plist +fi + exit 0 diff --git a/data/openssh/_metadata/version b/data/openssh/_metadata/version index ca85c0a6f..5d11f1120 100644 --- a/data/openssh/_metadata/version +++ b/data/openssh/_metadata/version @@ -1 +1 @@ -5.1p1 +5.2p1 diff --git a/data/openssh/make.sh b/data/openssh/make.sh index 56c32ecb6..ac2d1190d 100644 --- a/data/openssh/make.sh +++ b/data/openssh/make.sh @@ -1,6 +1,6 @@ pkg:setup autoconf -pkg:configure --disable-strip --sysconfdir=/etc/ssh +pkg:configure --disable-strip --sysconfdir=/etc/ssh --disable-libutil --disable-utmp --disable-wtmp ac_cv_path_AR=arm-apple-darwin9-ar make pkg:install INSTALL_SSH_RAND_HELPER=yes pkg: cp -a %/sshd-keygen-wrapper /usr/libexec diff --git a/data/openssh/openssh-5.1p1.tar.gz b/data/openssh/openssh-5.1p1.tar.gz Binary files differdeleted file mode 100644 index 56d4f060e..000000000 --- a/data/openssh/openssh-5.1p1.tar.gz +++ /dev/null diff --git a/data/openssh/openssh-5.2p1.tar.gz b/data/openssh/openssh-5.2p1.tar.gz Binary files differnew file mode 100644 index 000000000..053008ef2 --- /dev/null +++ b/data/openssh/openssh-5.2p1.tar.gz diff --git a/data/openssh/utmp.diff b/data/openssh/utmp.diff new file mode 100644 index 000000000..fcba24b7d --- /dev/null +++ b/data/openssh/utmp.diff @@ -0,0 +1,40 @@ +diff -ru openssh-5.2p1/includes.h openssh-5.2p1+iPhone/includes.h +--- openssh-5.2p1/includes.h 2008-07-04 13:10:49.000000000 +0000 ++++ openssh-5.2p1+iPhone/includes.h 2009-04-06 09:36:35.000000000 +0000 +@@ -18,6 +18,7 @@ + + #include "config.h" + ++#define _UTMPX_COMPAT + #define _GNU_SOURCE /* activate extra prototypes for glibc */ + + #include <sys/types.h> +@@ -63,6 +64,10 @@ + # include <login.h> + #endif + ++#ifdef HAVE_UTIL_H ++# include <util.h> ++#endif ++ + #ifdef HAVE_UTMP_H + # include <utmp.h> + #endif +diff -ru openssh-5.2p1/loginrec.c openssh-5.2p1+iPhone/loginrec.c +--- openssh-5.2p1/loginrec.c 2009-02-12 02:12:22.000000000 +0000 ++++ openssh-5.2p1+iPhone/loginrec.c 2009-04-06 09:30:45.000000000 +0000 +@@ -188,12 +188,12 @@ + ** prototypes for helper functions in this file + **/ + +-#if HAVE_UTMP_H ++#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) + void set_utmp_time(struct logininfo *li, struct utmp *ut); + void construct_utmp(struct logininfo *li, struct utmp *ut); + #endif + +-#ifdef HAVE_UTMPX_H ++#if defined(USE_UTMPX) || defined (USE_WTMPX) + void set_utmpx_time(struct logininfo *li, struct utmpx *ut); + void construct_utmpx(struct logininfo *li, struct utmpx *ut); + #endif diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version index e1f22a91a..7c6c3763c 100644 --- a/data/openssl/_metadata/version +++ b/data/openssl/_metadata/version @@ -1 +1 @@ -0.9.8i +0.9.8k diff --git a/data/openssl/armnm.diff b/data/openssl/armnm.diff deleted file mode 100644 index 2969a5c00..000000000 --- a/data/openssl/armnm.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru openssl-0.9.8g/Makefile.shared openssl-0.9.8g+iPhone/Makefile.shared ---- openssl-0.9.8g/Makefile.shared 2007-09-16 14:11:51.000000000 +0000 -+++ openssl-0.9.8g+iPhone/Makefile.shared 2007-12-30 04:20:19.000000000 +0000 -@@ -101,7 +101,7 @@ - LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ - SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ -- nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \ -+ $${PKG_TARG}-nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \ - LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ diff --git a/data/openssl/openssl-0.9.8i.tar.gz b/data/openssl/openssl-0.9.8i.tar.gz Binary files differdeleted file mode 100644 index a8607cc90..000000000 --- a/data/openssl/openssl-0.9.8i.tar.gz +++ /dev/null diff --git a/data/openssl/openssl-0.9.8k.tar.gz b/data/openssl/openssl-0.9.8k.tar.gz Binary files differnew file mode 100644 index 000000000..69d8d8f3f --- /dev/null +++ b/data/openssl/openssl-0.9.8k.tar.gz |