From 436f85db10f7beeeb4a1dc50c7694cd823cf72f9 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 7 Jan 2013 16:43:16 +0100 Subject: [PATCH] musl: Updated (0.9.8 -> 0.9.8+git820fccde) --- .../musl-0001-add-sys_ttydefaults.h.patch | 135 ++++++++++++++++++ base/musl/musl-0002-termios_ttydefaults.patch | 29 ++++ base/musl/musl-0003-add-missing-IPPROTO.patch | 48 +++++++ base/musl/musl.desc | 6 +- .../linux-3.4-musl-install-scsi-headers.patch | 37 ----- 5 files changed, 215 insertions(+), 40 deletions(-) create mode 100644 base/musl/musl-0001-add-sys_ttydefaults.h.patch create mode 100644 base/musl/musl-0002-termios_ttydefaults.patch create mode 100644 base/musl/musl-0003-add-missing-IPPROTO.patch delete mode 100644 base/musl/pkg_patch/linux/linux-3.4-musl-install-scsi-headers.patch diff --git a/base/musl/musl-0001-add-sys_ttydefaults.h.patch b/base/musl/musl-0001-add-sys_ttydefaults.h.patch new file mode 100644 index 000000000..699d28876 --- /dev/null +++ b/base/musl/musl-0001-add-sys_ttydefaults.h.patch @@ -0,0 +1,135 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../musl/musl-0001-add-sys_ttydefaults.h.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From ce087b399d563bbfbab999499c0aeefc06698145 Mon Sep 17 00:00:00 2001 +From: Christian Wiese +Date: Fri, 28 Dec 2012 01:58:50 +0100 +Subject: [PATCH] include: add sys/ttydefaults.h + +--- + include/sys/ttydefaults.h | 100 +++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 100 insertions(+), 0 deletions(-) + create mode 100644 include/sys/ttydefaults.h + +diff --git a/include/sys/ttydefaults.h b/include/sys/ttydefaults.h +new file mode 100644 +index 0000000..9be168b +--- /dev/null ++++ b/include/sys/ttydefaults.h +@@ -0,0 +1,100 @@ ++/*- ++ * Copyright (c) 1982, 1986, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * (c) UNIX System Laboratories, Inc. ++ * All or some portions of this file are derived from material licensed ++ * to the University of California by American Telephone and Telegraph ++ * Co. or Unix System Laboratories, Inc. and are reproduced herein with ++ * the permission of UNIX System Laboratories, Inc. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 4. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ * @(#)ttydefaults.h 8.4 (Berkeley) 1/21/94 ++ */ ++ ++/* ++ * System wide defaults for terminal state. Linux version. ++ */ ++#ifndef _SYS_TTYDEFAULTS_H_ ++#define _SYS_TTYDEFAULTS_H_ ++ ++/* ++ * Defaults on "first" open. ++ */ ++#define TTYDEF_IFLAG (BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY) ++#define TTYDEF_OFLAG (OPOST | ONLCR | XTABS) ++#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) ++#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL) ++#define TTYDEF_SPEED (B9600) ++ ++/* ++ * Control Character Defaults ++ */ ++#define CTRL(x) (x&037) ++#define CEOF CTRL('d') ++#ifdef _POSIX_VDISABLE ++# define CEOL _POSIX_VDISABLE ++#else ++# define CEOL '\0' /* XXX avoid _POSIX_VDISABLE */ ++#endif ++#define CERASE 0177 ++#define CINTR CTRL('c') ++#ifdef _POSIX_VDISABLE ++# define CSTATUS _POSIX_VDISABLE ++#else ++# define CSTATUS '\0' /* XXX avoid _POSIX_VDISABLE */ ++#endif ++#define CKILL CTRL('u') ++#define CMIN 1 ++#define CQUIT 034 /* FS, ^\ */ ++#define CSUSP CTRL('z') ++#define CTIME 0 ++#define CDSUSP CTRL('y') ++#define CSTART CTRL('q') ++#define CSTOP CTRL('s') ++#define CLNEXT CTRL('v') ++#define CDISCARD CTRL('o') ++#define CWERASE CTRL('w') ++#define CREPRINT CTRL('r') ++#define CEOT CEOF ++/* compat */ ++#define CBRK CEOL ++#define CRPRNT CREPRINT ++#define CFLUSH CDISCARD ++ ++/* PROTECTED INCLUSION ENDS HERE */ ++#endif /* !_SYS_TTYDEFAULTS_H_ */ ++ ++/* ++ * #define TTYDEFCHARS to include an array of default control characters. ++ */ ++#ifdef TTYDEFCHARS ++cc_t ttydefchars[NCCS] = { ++ CEOF, CEOL, CEOL, CERASE, CWERASE, CKILL, CREPRINT, ++ _POSIX_VDISABLE, CINTR, CQUIT, CSUSP, CDSUSP, CSTART, CSTOP, CLNEXT, ++ CDISCARD, CMIN, CTIME, CSTATUS, _POSIX_VDISABLE ++}; ++#undef TTYDEFCHARS ++#endif +-- +1.7.2.3 + diff --git a/base/musl/musl-0002-termios_ttydefaults.patch b/base/musl/musl-0002-termios_ttydefaults.patch new file mode 100644 index 000000000..df3ad34d9 --- /dev/null +++ b/base/musl/musl-0002-termios_ttydefaults.patch @@ -0,0 +1,29 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../musl/musl-0002-termios_ttydefaults.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +diff --git a/include/termios.h b/include/termios.h +index d73c780..f3021d6 100644 +--- a/include/termios.h ++++ b/include/termios.h +@@ -37,6 +37,8 @@ pid_t tcgetsid (int); + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + void cfmakeraw(struct termios *); + int cfsetspeed(struct termios *, speed_t); ++ ++#include + #endif + + #ifdef __cplusplus diff --git a/base/musl/musl-0003-add-missing-IPPROTO.patch b/base/musl/musl-0003-add-missing-IPPROTO.patch new file mode 100644 index 000000000..9834c2e47 --- /dev/null +++ b/base/musl/musl-0003-add-missing-IPPROTO.patch @@ -0,0 +1,48 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../musl/musl-0003-add-missing-IPPROTO.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 404ba86f89baa16256b51bbab2ad017ae8374158 Mon Sep 17 00:00:00 2001 +From: Christian Wiese +Date: Tue, 1 Jan 2013 23:14:02 +0100 +Subject: [PATCH] netinet/in.h: add defines for IPPROTO_{DCCP,SCTP,UDPLITE} + +--- + include/netinet/in.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/include/netinet/in.h b/include/netinet/in.h +index f2f89ab..1086f07 100644 +--- a/include/netinet/in.h ++++ b/include/netinet/in.h +@@ -81,6 +81,7 @@ uint16_t ntohs(uint16_t); + #define IPPROTO_UDP 17 + #define IPPROTO_IDP 22 + #define IPPROTO_TP 29 ++#define IPPROTO_DCCP 33 + #define IPPROTO_IPV6 41 + #define IPPROTO_ROUTING 43 + #define IPPROTO_FRAGMENT 44 +@@ -95,6 +96,8 @@ uint16_t ntohs(uint16_t); + #define IPPROTO_ENCAP 98 + #define IPPROTO_PIM 103 + #define IPPROTO_COMP 108 ++#define IPPROTO_SCTP 132 ++#define IPPROTO_UDPLITE 136 + #define IPPROTO_RAW 255 + #define IPPROTO_MAX 256 + +-- +1.7.2.3 diff --git a/base/musl/musl.desc b/base/musl/musl.desc index 472153a9c..5bf24089a 100644 --- a/base/musl/musl.desc +++ b/base/musl/musl.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../musl/musl.desc -[COPY] Copyright (C) 2012 The OpenSDE Project +[COPY] Copyright (C) 2012 - 2013 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -31,7 +31,7 @@ [L] MIT [S] Beta -[V] 0.9.8 +[V] 0.9.8+git820fccde [P] X 01-------9 101.700 -[D] 3825050574 musl-0.9.8.tar.gz http://www.musl-libc.org/releases/ +[D] 1388000283 musl-0.9.8+git820fccde.tar.gz http://www.musl-libc.org/releases/ diff --git a/base/musl/pkg_patch/linux/linux-3.4-musl-install-scsi-headers.patch b/base/musl/pkg_patch/linux/linux-3.4-musl-install-scsi-headers.patch deleted file mode 100644 index d870859ef..000000000 --- a/base/musl/pkg_patch/linux/linux-3.4-musl-install-scsi-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musl/pkg_patch/linux/linux-3.4-musl-install-scsi-headers.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./include/scsi/Kbuild.orig 2012-11-24 23:36:53.070293896 +0100 -+++ ./include/scsi/Kbuild 2012-11-24 23:42:07.749516830 +0100 -@@ -2,3 +2,5 @@ - header-y += scsi_netlink_fc.h - header-y += scsi_bsg_fc.h - header-y += fc/ -+header-y += scsi.h -+header-y += sg.h ---- ./include/scsi/scsi.h.orig 2012-11-24 23:48:57.019041848 +0100 -+++ ./include/scsi/scsi.h 2012-11-24 23:49:48.656295475 +0100 -@@ -9,7 +9,10 @@ - #define _SCSI_SCSI_H - - #include -+ -+#ifdef __KERNEL__ - #include -+#endif /* __KERNEL__ */ - - struct scsi_cmnd; -