diff options
Diffstat (limited to 'package')
19 files changed, 103 insertions, 129 deletions
diff --git a/package/krb5/Makefile b/package/krb5/Makefile index c20a09ce5..2af556c9e 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 -PKG_VERSION:= 1.11.3 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 56f0ae274b285320b8a597cb89442449 +PKG_VERSION:= 1.12.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 524b1067b619cb5bf780759b6884c3f5 PKG_DESCR:= MIT kerberos server PKG_SECTION:= crypto PKG_DEPENDS:= libkrb5 libncurses libss libcom-err keyutils PKG_DEPENDS+= libpthread PKG_BUILDDEP:= ncurses e2fsprogs gettext-tiny bison-host PKG_URL:= http://web.mit.edu/kerberos/ -PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.11/ +PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.12/ PKG_NOPARALLEL:= 1 PKG_LIBNAME:= libkrb5 PKG_OPTS:= dev diff --git a/package/krb5/patches/patch-src_include_k5-int_h b/package/krb5/patches/patch-src_include_k5-int_h index 1c6dd8e05..65bd936e6 100644 --- a/package/krb5/patches/patch-src_include_k5-int_h +++ b/package/krb5/patches/patch-src_include_k5-int_h @@ -1,6 +1,6 @@ ---- krb5-1.11.3.orig/src/include/k5-int.h 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/include/k5-int.h 2013-08-14 14:05:17.000000000 +0200 -@@ -1156,7 +1156,7 @@ void k5_free_pa_otp_challenge(krb5_conte +--- krb5-1.12.1.orig/src/include/k5-int.h 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/include/k5-int.h 2014-02-11 18:55:39.000000000 +0100 +@@ -904,7 +904,7 @@ void k5_free_pa_otp_challenge(krb5_conte void k5_free_pa_otp_req(krb5_context context, krb5_pa_otp_req *val); /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */ diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin deleted file mode 100644 index cd22cccf4..000000000 --- a/package/krb5/patches/patch-src_include_osconf_hin +++ /dev/null @@ -1,21 +0,0 @@ ---- krb5-1.11.3.orig/src/include/osconf.hin 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/include/osconf.hin 2013-08-14 14:05:17.000000000 +0200 -@@ -58,14 +58,14 @@ - #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins" - #define PLUGIN_EXT "@DYNOBJEXT" - --#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal" --#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5." --#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl" -+#define DEFAULT_KDB_FILE "@SYSCONFDIR/krb5kdc/principal" -+#define DEFAULT_KEYFILE_STUB "@SYSCONFDIR/krb5kdc/.k5." -+#define KRB5_DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/krb5_adm.acl" - /* Used by old admin server */ - #define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl" - - /* Location of KDC profile */ --#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf" -+#define DEFAULT_KDC_PROFILE "@SYSCONFDIR/krb5kdc/kdc.conf" - #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" - - #if TARGET_OS_MAC diff --git a/package/krb5/patches/patch-src_kdc_main_c b/package/krb5/patches/patch-src_kdc_main_c deleted file mode 100644 index 5b2e32607..000000000 --- a/package/krb5/patches/patch-src_kdc_main_c +++ /dev/null @@ -1,10 +0,0 @@ ---- krb5-1.11.3.orig/src/kdc/main.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/kdc/main.c 2013-08-14 14:05:17.000000000 +0200 -@@ -34,7 +34,6 @@ - #include <sys/wait.h> - - #include "k5-int.h" --#include "com_err.h" - #include "adm.h" - #include "adm_proto.h" - #include "kdc_util.h" diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in deleted file mode 100644 index cfbe7b475..000000000 --- a/package/krb5/patches/patch-src_krb5-config_in +++ /dev/null @@ -1,22 +0,0 @@ ---- krb5-1.11.3.orig/src/krb5-config.in 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/krb5-config.in 2013-08-14 14:05:17.000000000 +0200 -@@ -34,8 +34,6 @@ libdir=@libdir@ - CC_LINK='@CC_LINK@' - KDB5_DB_LIB=@KDB5_DB_LIB@ - LDFLAGS='@LDFLAGS@' --RPATH_FLAG='@RPATH_FLAG@' --PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@' - PTHREAD_CFLAGS='@PTHREAD_CFLAGS@' - DL_LIB='@DL_LIB@' - DEFCCNAME='@DEFCCNAME@' -@@ -213,10 +211,7 @@ if test -n "$do_libs"; then - # Ugly gross hack for our build tree - lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ - -e 's/\$(PURE)//' \ -- -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \ -- -e 's#\$(PROG_RPATH)#'$libdir'#' \ - -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ -- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)##'` diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c index dd47baea6..e29061185 100644 --- a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c +++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c @@ -1,11 +1,11 @@ ---- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/kadm5/alt_prof.c 2013-10-09 09:42:35.000000000 +0200 -@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon - char **values; - char *valp; +--- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/kadm5/alt_prof.c 2014-02-11 18:55:39.000000000 +0100 +@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon + krb5_error_code ret; + char **values, *valp; int idx; - krb5_boolean val; + krb5_boolean val = 0; - kret = krb5_aprof_getvals (acontext, hierarchy, &values); - if (kret) + ret = krb5_aprof_getvals(acontext, hierarchy, &values); + if (ret) diff --git a/package/krb5/patches/patch-src_lib_krad_packet_c b/package/krb5/patches/patch-src_lib_krad_packet_c new file mode 100644 index 000000000..71d3c53e1 --- /dev/null +++ b/package/krb5/patches/patch-src_lib_krad_packet_c @@ -0,0 +1,12 @@ +--- krb5-1.12.1.orig/src/lib/krad/packet.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/krad/packet.c 2014-02-11 19:01:06.000000000 +0100 +@@ -253,8 +253,8 @@ krad_packet_new_request(krb5_context ctx + { + krb5_error_code retval; + krad_packet *pkt; +- uchar id; + size_t attrset_len; ++ uchar id = NULL; + + pkt = packet_new(); + if (pkt == NULL) { diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c index a451a2710..f121d4b37 100644 --- a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c +++ b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c @@ -1,5 +1,5 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/gic_pwd.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/gic_pwd.c 2013-08-14 14:05:17.000000000 +0200 +--- krb5-1.12.1.orig/src/lib/krb5/krb/gic_pwd.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/krb5/krb/gic_pwd.c 2014-02-11 18:55:39.000000000 +0100 @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #include "k5-int.h" @@ -7,4 +7,4 @@ +#include <et/com_err.h> #include "init_creds_ctx.h" #include "int-proto.h" - + #include "os-proto.h" diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c b/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c deleted file mode 100644 index c2d8a1a0e..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c 2013-10-09 09:30:28.000000000 +0200 -@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr - size_t i, h; - int out_pa_list_size = 0; - krb5_pa_data **out_pa_list = NULL; -- krb5_error_code ret, module_ret; -+ krb5_error_code ret, module_ret = 0; - krb5_responder_fn responder = opte->opt_private->responder; - static const int paorder[] = { PA_INFO, PA_REAL }; - diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c deleted file mode 100644 index 21f503a99..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/sendauth.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/sendauth.c 2013-08-14 14:05:18.000000000 +0200 -@@ -25,7 +25,7 @@ - */ - - #include "k5-int.h" --#include "com_err.h" -+#include <et/com_err.h> - #include "auth_con.h" - #include <errno.h> - #include <stdio.h> diff --git a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c b/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c deleted file mode 100644 index 1651c4df7..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c 2013-10-09 09:34:54.000000000 +0200 -@@ -109,7 +109,7 @@ krb5int_utf8_normalize( - krb5_data ** newdataptr, - unsigned flags) - { -- int i, j, len, clen, outpos, ucsoutlen, outsize; -+ int i, j, len, clen, outpos = 0, ucsoutlen, outsize; - char *out = NULL, *outtmp, *s; - krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL; - krb5_data *newdata; diff --git a/package/mc/Makefile b/package/mc/Makefile index 267553653..a4931f94b 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -4,17 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mc -PKG_VERSION:= 4.7.0.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f48b2c8dd140aeb36f59d16a662f0779 +PKG_VERSION:= 4.8.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1a2d74b75ddbff0b0d6cdc04bf4a7d31 PKG_DESCR:= norton commander clone PKG_SECTION:= misc PKG_DEPENDS:= glib libncurses PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.midnight-commander.org/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= http://ftp.midnight-commander.org/ PKG_NOPARALLEL:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -45,7 +47,7 @@ mc-install: ${INSTALL_DIR} ${IDIR_MC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/ cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview - cd ${WRKINST}/etc/mc && ${CP} cedit.menu mc.ext \ - mc.lib mc.menu extfs ${IDIR_MC}/etc/mc/ + cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext \ + mc.menu ${IDIR_MC}/etc/mc/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mc/patches/patch-Makefile_in b/package/mc/patches/patch-Makefile_in deleted file mode 100644 index db881370a..000000000 --- a/package/mc/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- mc-4.7.0.2.orig/Makefile.in 2010-02-02 16:24:55.000000000 +0100 -+++ mc-4.7.0.2/Makefile.in 2010-02-06 00:46:00.203084693 +0100 -@@ -308,7 +308,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = intl po lib src contrib misc - EXTRA_DIST = - dist_noinst_SCRIPTS = build-glib2.sh - dist_noinst_HEADERS = $(top_srcdir)/version.h diff --git a/package/mc/patches/patch-lib_tty_key_c b/package/mc/patches/patch-lib_tty_key_c new file mode 100644 index 000000000..342eb8657 --- /dev/null +++ b/package/mc/patches/patch-lib_tty_key_c @@ -0,0 +1,18 @@ +--- mc-4.8.11.orig/lib/tty/key.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/key.c 2014-02-11 20:02:34.000000000 +0100 +@@ -1946,6 +1946,7 @@ int + tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) + { + int c; ++ static int flag = 0; /* Return value from select */ + #ifdef HAVE_LIBGPM + static struct Gpm_Event ev; /* Mouse event */ + #endif +@@ -1978,7 +1979,6 @@ tty_get_event (struct Gpm_Event *event, + while (pending_keys == NULL) + { + int nfd; +- static int flag = 0; /* Return value from select */ + fd_set select_set; + + FD_ZERO (&select_set); diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c new file mode 100644 index 000000000..5058bd79e --- /dev/null +++ b/package/mc/patches/patch-lib_tty_tty-ncurses_c @@ -0,0 +1,27 @@ +--- mc-4.8.11.orig/lib/tty/tty-ncurses.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/tty-ncurses.c 2014-02-12 12:40:05.000000000 +0100 +@@ -65,7 +65,7 @@ + + /*** file scope macro definitions ****************************************************************/ + +-#if defined(_AIX) && !defined(CTRL) ++#if !defined(CTRL) + #define CTRL(x) ((x) & 0x1f) + #endif + +@@ -530,6 +530,7 @@ tty_print_anychar (int c) + if (mc_global.utf8_display || c > 255) + { + int res; ++ unsigned char str[UTF8_CHAR_LEN + 1]; + + res = g_unichar_to_utf8 (c, (char *) str); + if (res == 0) +@@ -540,7 +541,6 @@ tty_print_anychar (int c) + } + else + { +- unsigned char str[UTF8_CHAR_LEN + 1]; + const char *s; + + str[res] = '\0'; diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 284036ece..a56ee80de 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 6.2p1 +PKG_VERSION:= 6.5p1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7b2d9dd75b5cf267ea1737ec75500316 +PKG_MD5SUM:= a084e7272b8cbd25afe0f5dce4802fef PKG_DESCR:= OpenSSH PKG_SECTION:= net/security PKG_BUILDDEP:= zlib openssl diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c index e7169b576..059d3cf86 100644 --- a/package/openssh/patches/patch-cipher_c +++ b/package/openssh/patches/patch-cipher_c @@ -1,7 +1,7 @@ diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c ---- openssh-6.2p1.orig/cipher.c 2013-02-12 01:00:35.000000000 +0100 -+++ openssh-6.2p1/cipher.c 2013-08-20 08:56:48.923159083 +0200 -@@ -69,23 +69,33 @@ struct Cipher { +--- openssh-6.5p1.orig/cipher.c 2014-01-25 23:37:26.000000000 +0100 ++++ openssh-6.5p1/cipher.c 2014-02-11 15:26:16.000000000 +0100 +@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, diff --git a/package/openssh/patches/patch-digest_c b/package/openssh/patches/patch-digest_c new file mode 100644 index 000000000..feead7711 --- /dev/null +++ b/package/openssh/patches/patch-digest_c @@ -0,0 +1,12 @@ +--- openssh-6.5p1.orig/digest.c 2014-01-20 02:41:53.000000000 +0100 ++++ openssh-6.5p1/digest.c 2014-02-11 17:41:23.000000000 +0100 +@@ -44,7 +44,9 @@ struct ssh_digest { + /* NB. Indexed directly by algorithm number */ + const struct ssh_digest digests[] = { + { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, ++#ifndef OPENSSL_NO_RIPEMD + { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, ++#endif + { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, + #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */ + { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c index df8eac301..7812de4b2 100644 --- a/package/openssh/patches/patch-mac_c +++ b/package/openssh/patches/patch-mac_c @@ -1,7 +1,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c ---- openssh-6.2p1.orig/mac.c 2012-12-12 01:00:37.000000000 +0100 -+++ openssh-6.2p1/mac.c 2013-08-20 08:56:49.123256567 +0200 -@@ -68,8 +68,10 @@ struct { +--- openssh-6.5p1.orig/mac.c 2014-01-10 00:37:05.000000000 +0100 ++++ openssh-6.5p1/mac.c 2014-02-11 15:26:16.000000000 +0100 +@@ -70,8 +70,10 @@ static const struct macalg macs[] = { #endif { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 }, { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 }, @@ -12,7 +12,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 }, { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 }, -@@ -82,7 +84,9 @@ struct { +@@ -84,7 +86,9 @@ static const struct macalg macs[] = { #endif { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, |