diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/cyrus-sasl/Makefile | 17 | ||||
| -rw-r--r-- | package/gdb/patches/patch-gdb_amd64-linux-nat_c | 12 | ||||
| -rw-r--r-- | package/gdb/src/gdb/debugreg.h | 48 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 5 | ||||
| -rw-r--r-- | package/ncurses/patches/patch-misc_terminfo_src | 174 | ||||
| -rw-r--r-- | package/ruby-ldap/Makefile | 16 | ||||
| -rw-r--r-- | package/ruby-ldap/patches/patch-rbldap_h | 23 | ||||
| -rw-r--r-- | package/ruby/patches/patch-io_c | 20 |
8 files changed, 122 insertions, 193 deletions
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 65169cf89..b3e1794b0 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl -PKG_VERSION:= 2.1.23 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 2eb0e48106f0e9cd8001e654f267ecbc +PKG_VERSION:= 2.1.26 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs PKG_BUILDDEP:= openssl PKG_DEPENDS:= libopenssl -PKG_URL:= http://asg.web.cmu.edu/sasl/ -PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ +PKG_URL:= http://cyrusimap.org/ +PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/ PKG_NOPARALLEL:= 1 PKG_LIBNAME:= libsasl2 PKG_OPTS:= dev @@ -22,10 +22,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-staticdlopen \ - --enable-cram \ --enable-plain \ --enable-anon \ - --enable-digest \ + --enable-login \ + --disable-cram \ + --disable-digest \ + --disable-scram \ --with-ipctype=unix \ --with-devrandom="/dev/urandom" \ --with-openssl="${STAGING_TARGET_DIR}/usr" \ @@ -39,7 +41,6 @@ CONFIGURE_ARGS+= --enable-staticdlopen \ --disable-krb4 \ --disable-gssapi \ --disable-gss_mutexes \ - --disable-login \ --disable-ntlm \ --disable-sql \ --disable-static \ diff --git a/package/gdb/patches/patch-gdb_amd64-linux-nat_c b/package/gdb/patches/patch-gdb_amd64-linux-nat_c index ac612d711..c50f1adf1 100644 --- a/package/gdb/patches/patch-gdb_amd64-linux-nat_c +++ b/package/gdb/patches/patch-gdb_amd64-linux-nat_c @@ -1,6 +1,6 @@ --- gdb-7.6.orig/gdb/amd64-linux-nat.c 2013-03-11 09:25:57.000000000 +0100 -+++ gdb-7.6/gdb/amd64-linux-nat.c 2013-09-04 13:29:05.000000000 +0200 -@@ -25,8 +25,6 @@ ++++ gdb-7.6/gdb/amd64-linux-nat.c 2013-10-26 22:30:11.000000000 +0200 +@@ -25,15 +25,13 @@ #include "regset.h" #include "linux-nat.h" #include "amd64-linux-tdep.h" @@ -9,6 +9,14 @@ #include "gdb_assert.h" #include "gdb_string.h" + #include "elf/common.h" + #include <sys/uio.h> + #include <sys/ptrace.h> +-#include <sys/debugreg.h> ++#include "debugreg.h" + #include <sys/syscall.h> + #include <sys/procfs.h> + #include <sys/user.h> @@ -1121,47 +1119,6 @@ amd64_linux_read_description (struct tar } } diff --git a/package/gdb/src/gdb/debugreg.h b/package/gdb/src/gdb/debugreg.h new file mode 100644 index 000000000..e4883c804 --- /dev/null +++ b/package/gdb/src/gdb/debugreg.h @@ -0,0 +1,48 @@ +#ifndef SYS_DEBUGREG_H +#define SYS_DEBUGREG_H + +#include <stdint.h> + +#define DR_FIRSTADDR 0 +#define DR_LASTADDR 3 + +#define DR_STATUS 6 +#define DR_CONTROL 7 + +#define DR_TRAP0 (0x1) +#define DR_TRAP1 (0x2) +#define DR_TRAP2 (0x4) +#define DR_TRAP3 (0x8) + +#define DR_STEP (0x4000) +#define DR_SWITCH (0x8000) + +#define DR_CONTROL_SHIFT 16 +#define DR_CONTROL_SIZE 4 + +#define DR_RW_EXECUTE (0x0) +#define DR_RW_WRITE (0x1) +#define DR_RW_READ (0x3) + +#define DR_LEN_1 (0x0) +#define DR_LEN_2 (0x4) +#define DR_LEN_4 (0xC) +#define DR_LEN_8 (0x8) + +#define DR_LOCAL_ENABLE_SHIFT 0 +#define DR_GLOBAL_ENABLE_SHIFT 1 +#define DR_ENABLE_SIZE 2 + +#define DR_LOCAL_ENABLE_MASK (0x55) +#define DR_GLOBAL_ENABLE_MASK (0xAA) + + +#if SIZE_MAX > 4294967295 +# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL) +#else +# define DR_CONTROL_RESERVED (0x00FC00U) +#endif +#define DR_LOCAL_SLOWDOWN (0x100) +#define DR_GLOBAL_SLOWDOWN (0x200) + +#endif diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index b923e8fa3..ba7be4d04 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs @@ -71,6 +71,7 @@ libncurses-hostinstall: ${CP} ${HOST_WRKINST}/usr/bin/* ${STAGING_HOST_DIR}/usr/bin libncurses-install: + rm -rf ${WRKINST}/usr/lib/terminfo # this is installed as libncurses - make libcurses a "link" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so @@ -84,7 +85,7 @@ ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y) else ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux screen vt100 vt102 \ - rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \ + rxvt vt220 xterm xterm-color xterm-xfree86; do \ ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ diff --git a/package/ncurses/patches/patch-misc_terminfo_src b/package/ncurses/patches/patch-misc_terminfo_src deleted file mode 100644 index 865759cb2..000000000 --- a/package/ncurses/patches/patch-misc_terminfo_src +++ /dev/null @@ -1,174 +0,0 @@ ---- ncurses-5.9.orig/misc/terminfo.src 2011-02-20 21:46:53.000000000 +0100 -+++ ncurses-5.9/misc/terminfo.src 2013-10-23 20:00:07.000000000 +0200 -@@ -4208,6 +4208,175 @@ rxvt-cygwin-native|rxvt terminal emulato - rxvt-16color|xterm with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 -+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 -+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005 -+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences -+rxvt-unicode|rxvt-unicode terminal (X Window System), -+ am, -+ bce, -+ eo, -+ km, -+ msgr, -+ xenl, -+ hs, -+ cols#80, -+ it#8, -+ lines#24, -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, -+ bel=^G, -+ blink=\E[5m, -+ bold=\E[1m, -+ civis=\E[?25l, -+ clear=\E[H\E[2J, -+ cnorm=\E[?25h, -+ cr=^M, -+ csr=\E[%i%p1%d;%p2%dr, -+ cub=\E[%p1%dD, -+ cub1=^H, -+ cud=\E[%p1%dB, -+ cud1=^J, -+ cuf=\E[%p1%dC, -+ cuf1=\E[C, -+ cup=\E[%i%p1%d;%p2%dH, -+ cuu=\E[%p1%dA, -+ cuu1=\E[A, -+ cvvis=\E[?25h, -+ dch=\E[%p1%dP, -+ dch1=\E[P, -+ dl=\E[%p1%dM, -+ dl1=\E[M, -+ ed=\E[J, -+ el=\E[K, -+ el1=\E[1K, -+ flash=\E[?5h$<20/>\E[?5l, -+ home=\E[H, -+ hpa=\E[%i%p1%dG, -+ ht=^I, -+ hts=\EH, -+ ich=\E[%p1%d@, -+ ich1=\E[@, -+ il=\E[%p1%dL, -+ il1=\E[L, -+ ind=^J, -+ is1=\E[\041p, -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ kDC=\E[3$, -+ kIC=\E2$, -+ kEND=\E[8$, -+ kHOM=\E[7$, -+ kLFT=\E[d, -+ kNXT=\E[6$, -+ kPRV=\E[5$, -+ kRIT=\E[c, -+ kbs=\177, -+ ka1=\EOw, -+ ka3=\EOy, -+ kb2=\EOu, -+ kc1=\EOq, -+ kc3=\EOs, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ kf1=\E[11~, -+ kf10=\E[21~, -+ kf11=\E[23~, -+ kf12=\E[24~, -+ kf13=\E[25~, -+ kf14=\E[26~, -+ kf15=\E[28~, -+ kf16=\E[29~, -+ kf17=\E[31~, -+ kf18=\E[32~, -+ kf19=\E[33~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\017, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#256, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ - # mrxvt 0.5.4 - # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index 8f26ca0ef..6289c1cb8 100644 --- a/package/ruby-ldap/Makefile +++ b/package/ruby-ldap/Makefile @@ -24,17 +24,19 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= DESTDIR="/" do-configure: - (cd $(WRKBUILD) && $(STAGING_DIR)/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/1.9.1/$(CPU_ARCH)-linux/ extconf.rb \ + (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \ --with-openldap2 \ + --without-libnsl \ + --with-ldap-dir=$(STAGING_DIR)/usr \ --with-ldap-lib=$(STAGING_DIR)/usr/lib \ --with-ldap-include=$(STAGING_DIR)/usr/include) ruby-ldap-install: - $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux - $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap - $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux/ldap.so \ - $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux - $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/1.9.1/ldap/*.rb \ - $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap + $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap + $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \ + $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \ + $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ruby-ldap/patches/patch-rbldap_h b/package/ruby-ldap/patches/patch-rbldap_h new file mode 100644 index 000000000..6e4e68dd7 --- /dev/null +++ b/package/ruby-ldap/patches/patch-rbldap_h @@ -0,0 +1,23 @@ +--- ruby-ldap-0.9.8.orig/rbldap.h 2009-03-25 10:25:27.000000000 +0100 ++++ ruby-ldap-0.9.8/rbldap.h 2013-10-26 23:33:03.000000000 +0200 +@@ -162,16 +162,18 @@ VALUE rb_ldap_mod_vals (VALUE); + RB_LDAPENTRY_DATA *ptr; \ + Data_Get_Struct(obj, struct rb_ldapmsg_data, ptr); \ + if( ! ptr->msg ){ \ ++ VALUE value = rb_inspect(obj); \ + rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \ +- STR2CSTR(rb_inspect(obj))); \ ++ StringValuePtr(value)); \ + }; \ + } + + #define GET_LDAPENTRY_DATA(obj,ptr) { \ + Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \ + if( ! ptr->msg ){ \ ++ VALUE value = rb_inspect(obj); \ + rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \ +- STR2CSTR(rb_inspect(obj))); \ ++ StringValuePtr(value)); \ + }; \ + } + diff --git a/package/ruby/patches/patch-io_c b/package/ruby/patches/patch-io_c new file mode 100644 index 000000000..dea7f46fd --- /dev/null +++ b/package/ruby/patches/patch-io_c @@ -0,0 +1,20 @@ +--- ruby-2.0.0-p247.orig/io.c 2013-06-12 16:23:39.000000000 +0200 ++++ ruby-2.0.0-p247/io.c 2013-10-26 23:02:53.000000000 +0200 +@@ -8483,7 +8483,7 @@ do_ioctl(int fd, ioctl_req_t cmd, long n + + #define DEFULT_IOCTL_NARG_LEN (256) + +-#ifdef __linux__ ++#if defined(__GLIBC__) && defined(__linux__) + static long + linux_iocparm_len(ioctl_req_t cmd) + { +@@ -8516,7 +8516,7 @@ ioctl_narg_len(ioctl_req_t cmd) + #endif + #ifdef IOCPARM_LEN + len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */ +-#elif defined(__linux__) ++#elif defined(__GLIBC__) && defined(__linux__) + len = linux_iocparm_len(cmd); + #else + /* otherwise guess at what's safe */ |