diff options
71 files changed, 1387 insertions, 577 deletions
diff --git a/system/console-setup/APKBUILD b/system/console-setup/APKBUILD index e833d66ef..519d9cffb 100644 --- a/system/console-setup/APKBUILD +++ b/system/console-setup/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=console-setup pkgver=1.191 -pkgrel=0 +pkgrel=1 pkgdesc="Set up console font and keyboard layout" url="https://salsa.debian.org/installer-team/console-setup" arch="noarch" options="!check" # No test suite. license="MIT AND GPL-2.0+ AND BSD-3-Clause" -depends="kbd" +depends="ckbcomp kbd" makedepends="perl" subpackages="$pkgname-doc console-fonts:fonts console-keymaps:keymaps $pkgname-openrc ckbcomp" diff --git a/system/docbook-xsl/APKBUILD b/system/docbook-xsl/APKBUILD index 0482a76ef..ebfbf4dee 100644 --- a/system/docbook-xsl/APKBUILD +++ b/system/docbook-xsl/APKBUILD @@ -2,23 +2,25 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=docbook-xsl pkgver=1.79.1 -pkgrel=2 +pkgrel=3 pkgdesc="XML stylesheets for Docbook-xml transformations." url="http://docbook.sourceforge.net/" arch="noarch" options="!check" # Just XML files license="MIT" depends="libxml2-utils libxslt docbook-xml" +subpackages="$pkgname-ns" makedepends="" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2 + https://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/$pkgver/$pkgname-ns-$pkgver.tar.bz2 765567_non-recursive_string_subst.patch " package() { cd "$builddir" local _dest dir f - _dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver + _dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets install -dm755 "$_dest" install -m644 VERSION VERSION.xsl "$_dest"/ @@ -40,5 +42,31 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/COPYING } +ns() { + cd "$srcdir/${pkgname}-ns-${pkgver}" + local _dest dir f + _dest="$subpkgdir"/usr/share/xml/docbook/xsl-stylesheets-ns + + install -dm755 "$_dest" + install -m644 VERSION VERSION.xsl "$_dest"/ + + for dir in assembly common eclipse epub epub3 fo highlighting html \ + htmlhelp javahelp lib manpages params profiling roundtrip \ + template website xhtml xhtml-1_1 xhtml5; do + + install -dm755 $_dest/$dir + for f in $dir/*.xml $dir/*.xsl $dir/*.dtd $dir/*.ent; do + [ -e "$f" ] || continue + install -m644 $f $_dest/$dir + done + done + + install -dm755 "$subpkgdir"/etc/xml + + install -m644 -D COPYING \ + "$subpkgdir"/usr/share/licenses/$pkgname/COPYING +} + sha512sums="83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 docbook-xsl-1.79.1.tar.bz2 +23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9 docbook-xsl-ns-1.79.1.tar.bz2 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04 765567_non-recursive_string_subst.patch" diff --git a/system/gcc/006_as-needed-gold.patch b/system/gcc/006_as-needed-gold.patch new file mode 100644 index 000000000..3dc0aee7a --- /dev/null +++ b/system/gcc/006_as-needed-gold.patch @@ -0,0 +1,58 @@ +# DP: Use --push-state/--pop-state for gold as well when linking libtsan. + +Index: src/gcc/gcc.c +=================================================================== +--- src/gcc/gcc.c ++++ src/gcc/gcc.c +@@ -686,10 +686,10 @@ proper position among the other output f + #define LIBASAN_SPEC STATIC_LIBASAN_LIBS + #elif defined(HAVE_LD_STATIC_DYNAMIC) + #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \ +- " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ ++ " %{!static-libasan:--push-state --no-as-needed}" \ + " -lasan " \ + " %{static-libasan:" LD_DYNAMIC_OPTION "}" \ +- " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ ++ " %{!static-libasan:--pop-state}" \ + STATIC_LIBASAN_LIBS + #else + #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS +@@ -707,10 +707,10 @@ proper position among the other output f + #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS + #elif defined(HAVE_LD_STATIC_DYNAMIC) + #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \ +- " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ ++ " %{!static-libtsan:--push-state --no-as-needed}" \ + " -ltsan " \ + " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \ +- " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ ++ " %{!static-libtsan:--pop-state}" \ + STATIC_LIBTSAN_LIBS + #else + #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS +@@ -728,10 +728,10 @@ proper position among the other output f + #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS + #elif defined(HAVE_LD_STATIC_DYNAMIC) + #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \ +- " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ ++ " %{!static-liblsan:--push-state --no-as-needed}" \ + " -llsan " \ + " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \ +- " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ ++ " %{!static-liblsan:--pop-state}" \ + STATIC_LIBLSAN_LIBS + #else + #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS +@@ -747,10 +747,10 @@ proper position among the other output f + " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}" + #ifdef HAVE_LD_STATIC_DYNAMIC + #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \ +- " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ ++ " %{!static-libubsan:--push-state --no-as-needed}" \ + " -lubsan " \ + " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \ +- " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ ++ " %{!static-libubsan:--pop-state}" \ + STATIC_LIBUBSAN_LIBS + #else + #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS diff --git a/system/gcc/201-ada.patch b/system/gcc/201-ada.patch new file mode 100644 index 000000000..acb1e1f1b --- /dev/null +++ b/system/gcc/201-ada.patch @@ -0,0 +1,565 @@ +diff --git a/gcc/ada/adadecode.c b/gcc/ada/adadecode.c +index a63b7e7641b0..92155ef2025a 100644 +--- a/gcc/ada/adadecode.c ++++ b/gcc/ada/adadecode.c +@@ -29,6 +29,7 @@ + * * + ****************************************************************************/ + ++#include "adaint.h" /* for a macro version of xstrdup. */ + + #if defined(IN_RTS) + #include "tconfig.h" +@@ -42,8 +43,6 @@ + #include <stdio.h> + #include <ctype.h> + +-#include "adaint.h" /* for a macro version of xstrdup. */ +- + #ifndef ISDIGIT + #define ISDIGIT(c) isdigit(c) + #endif +diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c +index 414346558654..2586a1368903 100644 +--- a/gcc/ada/adaint.c ++++ b/gcc/ada/adaint.c +@@ -85,6 +85,8 @@ + #define _LARGEFILE64_SOURCE 1 + #endif + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -202,8 +204,6 @@ UINT __gnat_current_ccs_encoding; + #include <utime.h> + #endif + +-#include "adaint.h" +- + /* Define symbols O_BINARY and O_TEXT as harmless zeroes if they are not + defined in the current system. On DOS-like systems these flags control + whether the file is opened/created in text-translation mode (CR/LF in +diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h +index 0d12f7e90209..74182446d4ac 100644 +--- a/gcc/ada/adaint.h ++++ b/gcc/ada/adaint.h +@@ -316,6 +316,7 @@ extern void *__gnat_lwp_self (void); + + /* Routines for interface to required CPU set primitives */ + ++#define _GNU_SOURCE + #include <sched.h> + + extern cpu_set_t *__gnat_cpu_alloc (size_t); +diff --git a/gcc/ada/argv.c b/gcc/ada/argv.c +index f62cf1eb37dc..0b6c5fe6f0df 100644 +--- a/gcc/ada/argv.c ++++ b/gcc/ada/argv.c +@@ -42,6 +42,8 @@ + main program, and these routines are accessed from the + Ada.Command_Line.Environment package. */ + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -51,8 +53,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" +- + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/gcc/ada/cio.c b/gcc/ada/cio.c +index ff97abe36ef1..56aa3477c8cd 100644 +--- a/gcc/ada/cio.c ++++ b/gcc/ada/cio.c +@@ -29,6 +29,8 @@ + * * + ****************************************************************************/ + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -38,8 +40,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" +- + /* We need L_tmpnam definition */ + #include <stdio.h> + +diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c +index cdcb531e2b3f..dde6b9948089 100644 +--- a/gcc/ada/cstreams.c ++++ b/gcc/ada/cstreams.c +@@ -52,6 +52,8 @@ + #include "vxWorks.h" + #endif + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -61,8 +63,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" +- + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/gcc/ada/exit.c b/gcc/ada/exit.c +index 6274571c6f04..336b0f8f386b 100644 +--- a/gcc/ada/exit.c ++++ b/gcc/ada/exit.c +@@ -33,6 +33,8 @@ + #include "vxWorks.h" + #endif + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -42,8 +44,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" +- + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index 0258f106d404..0416244ae428 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -1574,7 +1574,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),) + endif + + # ARM linux, GNU eabi +-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),) ++ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),) + LIBGNAT_TARGET_PAIRS = \ + a-intnam.ads<libgnarl/a-intnam__linux.ads \ + s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ +diff --git a/gcc/ada/init.c b/gcc/ada/init.c +index 5088ecffc4f1..02a45b3ce7ca 100644 +--- a/gcc/ada/init.c ++++ b/gcc/ada/init.c +@@ -53,6 +53,8 @@ + #undef __linux__ + #endif + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -65,7 +67,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" + #include "raise.h" + + #ifdef __cplusplus +diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads +index 5bf4a5fe1d26..c52cc70dfbab 100644 +--- a/gcc/ada/libgnarl/s-osinte__linux.ads ++++ b/gcc/ada/libgnarl/s-osinte__linux.ads +@@ -394,12 +394,6 @@ package System.OS_Interface is + PTHREAD_RWLOCK_PREFER_WRITER_NP : constant := 1; + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2; + +- function pthread_rwlockattr_setkind_np +- (attr : access pthread_rwlockattr_t; +- pref : int) return int; +- pragma Import +- (C, pthread_rwlockattr_setkind_np, "pthread_rwlockattr_setkind_np"); +- + function pthread_rwlock_init + (mutex : access pthread_rwlock_t; + attr : access pthread_rwlockattr_t) return int; +@@ -464,11 +458,6 @@ package System.OS_Interface is + protocol : int) return int; + pragma Import (C, pthread_mutexattr_setprotocol); + +- function pthread_mutexattr_setprioceiling +- (attr : access pthread_mutexattr_t; +- prioceiling : int) return int; +- pragma Import (C, pthread_mutexattr_setprioceiling); +- + type struct_sched_param is record + sched_priority : int; -- scheduling priority + end record; +diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb +index e55cd65e54f6..32d72b3980a6 100644 +--- a/gcc/ada/libgnarl/s-taprop__linux.adb ++++ b/gcc/ada/libgnarl/s-taprop__linux.adb +@@ -202,9 +202,6 @@ package body System.Task_Primitives.Operations is + pragma Import + (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup"); + +- function GNAT_has_cap_sys_nice return C.int; +- pragma Import +- (C, GNAT_has_cap_sys_nice, "__gnat_has_cap_sys_nice"); + -- We do not have pragma Linker_Options ("-lcap"); here, because this + -- library is not present on many Linux systems. 'libcap' is the Linux + -- "capabilities" library, called by __gnat_has_cap_sys_nice. +@@ -214,38 +211,6 @@ package body System.Task_Primitives.Operations is + -- Convert Ada priority to Linux priority. Priorities are 1 .. 99 on + -- GNU/Linux, so we map 0 .. 98 to 1 .. 99. + +- function Get_Ceiling_Support return Boolean; +- -- Get the value of the Ceiling_Support constant (see below). +- -- Note well: If this function or related code is modified, it should be +- -- tested by hand, because automated testing doesn't exercise it. +- +- ------------------------- +- -- Get_Ceiling_Support -- +- ------------------------- +- +- function Get_Ceiling_Support return Boolean is +- Ceiling_Support : Boolean := False; +- begin +- if Locking_Policy /= 'C' then +- return False; +- end if; +- +- declare +- function geteuid return Integer; +- pragma Import (C, geteuid, "geteuid"); +- Superuser : constant Boolean := geteuid = 0; +- Has_Cap : constant C.int := GNAT_has_cap_sys_nice; +- pragma Assert (Has_Cap in 0 | 1); +- begin +- Ceiling_Support := Superuser or else Has_Cap = 1; +- end; +- +- return Ceiling_Support; +- end Get_Ceiling_Support; +- +- pragma Warnings (Off, "non-static call not allowed in preelaborated unit"); +- Ceiling_Support : constant Boolean := Get_Ceiling_Support; +- pragma Warnings (On, "non-static call not allowed in preelaborated unit"); + -- True if the locking policy is Ceiling_Locking, and the current process + -- has permission to use this policy. The process has permission if it is + -- running as 'root', or if the capability was set by the setcap command, +@@ -348,7 +313,9 @@ package body System.Task_Primitives.Operations is + -- Init_Mutex -- + ---------------- + ++ pragma Warnings (Off, "formal parameter * is not referenced"); + function Init_Mutex (L : RTS_Lock_Ptr; Prio : Any_Priority) return C.int is ++ pragma Warnings (On, "formal parameter * is not referenced"); + Mutex_Attr : aliased pthread_mutexattr_t; + Result, Result_2 : C.int; + +@@ -360,16 +327,7 @@ package body System.Task_Primitives.Operations is + return Result; + end if; + +- if Ceiling_Support then +- Result := pthread_mutexattr_setprotocol +- (Mutex_Attr'Access, PTHREAD_PRIO_PROTECT); +- pragma Assert (Result = 0); +- +- Result := pthread_mutexattr_setprioceiling +- (Mutex_Attr'Access, Prio_To_Linux_Prio (Prio)); +- pragma Assert (Result = 0); +- +- elsif Locking_Policy = 'I' then ++ if Locking_Policy = 'I' then + Result := pthread_mutexattr_setprotocol + (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT); + pragma Assert (Result = 0); +@@ -409,11 +367,6 @@ package body System.Task_Primitives.Operations is + Result := pthread_rwlockattr_init (RWlock_Attr'Access); + pragma Assert (Result = 0); + +- Result := pthread_rwlockattr_setkind_np +- (RWlock_Attr'Access, +- PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); +- pragma Assert (Result = 0); +- + Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access); + + pragma Assert (Result in 0 | ENOMEM); +diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb +index a857b67132af..1e2bb4c545ad 100644 +--- a/gcc/ada/libgnat/s-dwalin.adb ++++ b/gcc/ada/libgnat/s-dwalin.adb +@@ -382,7 +382,7 @@ package body System.Dwarf_Lines is + + function Low (C : Dwarf_Context) return Address is + begin +- return C.Low; ++ return To_Address (To_Integer (C.Low) + C.Load_Slide); + end Low; + + ---------- +@@ -1210,19 +1210,21 @@ package body System.Dwarf_Lines is + -- Discard symbols whose length is 0 + Sz := uint32 (Size (S)); + +- -- Try to filter symbols at the same address. This is a best +- -- effort as they might not be consecutive. +- Addr := uint32 (Value (S) - uint64 (C.Low)); +- if Sz > 0 and then Addr /= Prev_Addr then +- Nbr_Symbols := Nbr_Symbols + 1; +- Prev_Addr := Addr; +- +- if Phase = 2 then +- C.Cache (Nbr_Symbols) := +- (First => Addr, +- Size => Sz, +- Sym => uint32 (Off (S)), +- Line => 0); ++ if Sz > 0 then ++ -- Try to filter symbols at the same address. This is a best ++ -- effort as they might not be consecutive. ++ Addr := uint32 (Value (S) - uint64 (C.Low)); ++ if Addr /= Prev_Addr then ++ Nbr_Symbols := Nbr_Symbols + 1; ++ Prev_Addr := Addr; ++ ++ if Phase = 2 then ++ C.Cache (Nbr_Symbols) := ++ (First => Addr, ++ Size => Sz, ++ Sym => uint32 (Off (S)), ++ Line => 0); ++ end if; + end if; + end if; + +@@ -1267,6 +1269,10 @@ package body System.Dwarf_Lines is + -- Read table + loop + Read_Aranges_Entry (C, Ar_Start, Ar_Len); ++ -- Skip references to discarded sections ++ while Ar_Start = 0 and Ar_Len /= 0 loop ++ Read_Aranges_Entry (C, Ar_Start, Ar_Len); ++ end loop; + exit when Ar_Start = 0 and Ar_Len = 0; + + Len := uint32 (Ar_Len); +diff --git a/gcc/ada/libgnat/s-trasym__dwarf.adb b/gcc/ada/libgnat/s-trasym__dwarf.adb +index db7c5eb4cdd8..3cd60ecbc37b 100644 +--- a/gcc/ada/libgnat/s-trasym__dwarf.adb ++++ b/gcc/ada/libgnat/s-trasym__dwarf.adb +@@ -123,7 +123,8 @@ package body System.Traceback.Symbolic is + -- Return the String contained in Item, up until the first NUL character + + pragma Warnings (Off, "*Add_Module_To_Cache*"); +- procedure Add_Module_To_Cache (Module_Name : String); ++ procedure Add_Module_To_Cache (Module_Name : String; ++ Load_Address : System.Address); + -- To be called by Build_Cache_For_All_Modules to add a new module to the + -- list. May not be referenced. + +@@ -217,12 +218,13 @@ package body System.Traceback.Symbolic is + -- Add_Module_To_Cache -- + ------------------------- + +- procedure Add_Module_To_Cache (Module_Name : String) is ++ procedure Add_Module_To_Cache (Module_Name : String; ++ Load_Address : System.Address) is + Module : Module_Cache_Acc; + Success : Boolean; + begin + Module := new Module_Cache; +- Init_Module (Module.all, Success, Module_Name); ++ Init_Module (Module.all, Success, Module_Name, Load_Address); + if not Success then + Free (Module); + return; +diff --git a/gcc/ada/libgnat/s-tsmona__linux.adb b/gcc/ada/libgnat/s-tsmona__linux.adb +index cbebd0652048..c882aa64a6e2 100644 +--- a/gcc/ada/libgnat/s-tsmona__linux.adb ++++ b/gcc/ada/libgnat/s-tsmona__linux.adb +@@ -87,45 +87,49 @@ package body Module_Name is + -- Build_Cache_For_All_Modules -- + --------------------------------- + +- procedure Build_Cache_For_All_Modules is +- type link_map; +- type link_map_acc is access all link_map; +- pragma Convention (C, link_map_acc); +- +- type link_map is record +- l_addr : Address; +- -- Base address of the shared object +- +- l_name : Address; +- -- Null-terminated absolute file name +- +- l_ld : Address; +- -- Dynamic section +- +- l_next, l_prev : link_map_acc; +- -- Chain +- end record; +- pragma Convention (C, link_map); +- +- type r_debug_type is record +- r_version : Integer; +- r_map : link_map_acc; +- end record; +- pragma Convention (C, r_debug_type); ++ type dl_phdr_info is record ++ dlpi_addr : Address; ++ dlpi_name : Address; ++ dlpi_phdr : Address; ++ dlpi_phnum : unsigned_short; ++ end record; ++ pragma Convention (C, dl_phdr_info); ++ ++ type Callback_Type is access function ++ (info : not null access dl_phdr_info; ++ size : size_t; ++ data : Address) return int; ++ pragma Convention (C, Callback_Type); ++ ++ function Build_Cache_Callback ++ (info : not null access dl_phdr_info; ++ size : size_t; ++ data : Address) return int; ++ pragma Convention (C, Build_Cache_Callback); ++ ++ function Build_Cache_Callback ++ (info : not null access dl_phdr_info; ++ size : size_t; ++ data : Address) return int is ++ pragma Unreferenced (size); ++ pragma Unreferenced (data); ++ begin ++ if Big_String_Conv.To_Pointer (info.dlpi_name) (1) /= ASCII.NUL then ++ -- Discard non-file (like the executable itself or the gate). ++ Add_Module_To_Cache (Value (info.dlpi_name), info.dlpi_addr); ++ end if; ++ return 0; ++ end Build_Cache_Callback; + +- r_debug : r_debug_type; +- pragma Import (C, r_debug, "_r_debug"); ++ function dl_iterate_phdr ++ (callback : Callback_Type; ++ data : Address) return int; ++ pragma Import (C, dl_iterate_phdr, "dl_iterate_phdr"); + +- lm : link_map_acc; ++ procedure Build_Cache_For_All_Modules is ++ unused : int; + begin +- lm := r_debug.r_map; +- while lm /= null loop +- if Big_String_Conv.To_Pointer (lm.l_name) (1) /= ASCII.NUL then +- -- Discard non-file (like the executable itself or the gate). +- Add_Module_To_Cache (Value (lm.l_name)); +- end if; +- lm := lm.l_next; +- end loop; ++ unused := dl_iterate_phdr (Build_Cache_Callback'Access, Null_Address); + end Build_Cache_For_All_Modules; + + --------- +diff --git a/gcc/ada/mkdir.c b/gcc/ada/mkdir.c +index c101d968a851..43cdd51e8320 100644 +--- a/gcc/ada/mkdir.c ++++ b/gcc/ada/mkdir.c +@@ -34,6 +34,8 @@ + #include <version.h> + #endif /* __vxworks */ + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -53,8 +55,6 @@ + #endif + #endif + +-#include "adaint.h" +- + /* This function provides a portable binding to the mkdir function. */ + + int +diff --git a/gcc/ada/raise.c b/gcc/ada/raise.c +index 70ad6cd3282a..eb92de1b2137 100644 +--- a/gcc/ada/raise.c ++++ b/gcc/ada/raise.c +@@ -32,6 +32,8 @@ + /* Shared routines to support exception handling. __gnat_unhandled_terminate + is shared between all exception handling mechanisms. */ + ++#include "adaint.h" ++ + #ifdef IN_RTS + #include "tconfig.h" + #include "tsystem.h" +@@ -40,7 +42,6 @@ + #include "system.h" + #endif + +-#include "adaint.h" + #include "raise.h" + + #ifdef __cplusplus +diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c +index 98b3901cb16f..98db6a14c2d5 100644 +--- a/gcc/ada/sysdep.c ++++ b/gcc/ada/sysdep.c +@@ -52,6 +52,8 @@ + #undef __linux__ + #endif + ++#include "adaint.h" ++ + #ifdef IN_RTS + #define POSIX + #include "tconfig.h" +@@ -72,8 +74,6 @@ + extern struct tm *localtime_r(const time_t *, struct tm *); + #endif + +-#include "adaint.h" +- + /* Don't use macros versions of this functions on VxWorks since they cause + imcompatible changes in some VxWorks versions */ + #ifdef __vxworks +diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c +index 7025f57d645e..074845584958 100644 +--- a/gcc/ada/terminals.c ++++ b/gcc/ada/terminals.c +@@ -1112,7 +1112,6 @@ __gnat_setup_winsize (void *desc, int rows, int columns) + (HP-UX) */ + #if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \ + && !defined (__rtems__) && !defined (__QNXNTO__) +-# include <termio.h> + #endif + + #include <sys/ioctl.h> +@@ -1159,7 +1158,8 @@ __gnat_setup_winsize (void *desc, int rows, int columns) + #if defined (__APPLE__) || defined (BSD) + #define USE_OPENPTY + #elif defined (__linux__) +-#define USE_GETPT ++#include <pty.h> ++#define USE_OPENPTY + #elif defined (__sun__) + #define USE_CLONE_DEVICE "/dev/ptmx" + #elif defined (_AIX) diff --git a/system/gcc/401-libsanitizer-linux.patch b/system/gcc/401-libsanitizer-linux.patch new file mode 100644 index 000000000..8a662a268 --- /dev/null +++ b/system/gcc/401-libsanitizer-linux.patch @@ -0,0 +1,100 @@ +--- gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc.old 2017-10-19 11:23:59.000000000 +0000 ++++ gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cc 2019-06-27 05:39:48.258332316 +0000 +@@ -752,7 +752,9 @@ + } + + #if SANITIZER_LINUX ++#ifndef SA_RESTORER + #define SA_RESTORER 0x04000000 ++#endif + // Doesn't set sa_restorer if the caller did not set it, so use with caution + //(see below). + int internal_sigaction_norestorer(int signum, const void *act, void *oldact) { +@@ -1687,65 +1689,59 @@ + } + + static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { +-#if defined(__arm__) + ucontext_t *ucontext = (ucontext_t*)context; ++#if defined(__arm__) + *pc = ucontext->uc_mcontext.arm_pc; + *bp = ucontext->uc_mcontext.arm_fp; + *sp = ucontext->uc_mcontext.arm_sp; + #elif defined(__aarch64__) +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.pc; + *bp = ucontext->uc_mcontext.regs[29]; + *sp = ucontext->uc_mcontext.sp; + #elif defined(__hppa__) +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.sc_iaoq[0]; + /* GCC uses %r3 whenever a frame pointer is needed. */ + *bp = ucontext->uc_mcontext.sc_gr[3]; + *sp = ucontext->uc_mcontext.sc_gr[30]; + #elif defined(__x86_64__) + # if SANITIZER_FREEBSD +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.mc_rip; + *bp = ucontext->uc_mcontext.mc_rbp; + *sp = ucontext->uc_mcontext.mc_rsp; + #elif SANITIZER_NETBSD +- ucontext_t *ucontext = (ucontext_t *)context; + *pc = ucontext->uc_mcontext.__gregs[_REG_RIP]; + *bp = ucontext->uc_mcontext.__gregs[_REG_RBP]; + *sp = ucontext->uc_mcontext.__gregs[_REG_RSP]; + # else +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.gregs[REG_RIP]; + *bp = ucontext->uc_mcontext.gregs[REG_RBP]; + *sp = ucontext->uc_mcontext.gregs[REG_RSP]; + # endif + #elif defined(__i386__) + # if SANITIZER_FREEBSD +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.mc_eip; + *bp = ucontext->uc_mcontext.mc_ebp; + *sp = ucontext->uc_mcontext.mc_esp; + #elif SANITIZER_NETBSD +- ucontext_t *ucontext = (ucontext_t *)context; + *pc = ucontext->uc_mcontext.__gregs[_REG_EIP]; + *bp = ucontext->uc_mcontext.__gregs[_REG_EBP]; + *sp = ucontext->uc_mcontext.__gregs[_REG_ESP]; + # else +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.gregs[REG_EIP]; + *bp = ucontext->uc_mcontext.gregs[REG_EBP]; + *sp = ucontext->uc_mcontext.gregs[REG_ESP]; + # endif +-#elif defined(__powerpc__) || defined(__powerpc64__) +- ucontext_t *ucontext = (ucontext_t*)context; +- *pc = ucontext->uc_mcontext.regs->nip; +- *sp = ucontext->uc_mcontext.regs->gpr[PT_R1]; ++#elif defined(__powerpc64__) ++ *pc = ucontext->uc_mcontext.gp_regs[32]; ++ *sp = ucontext->uc_mcontext.gp_regs[1]; ++ *bp = ucontext->uc_mcontext.gp_regs[31]; ++#elif defined(__powerpc__) ++ *pc = ucontext->uc_mcontext.gregs[32]; ++ *sp = ucontext->uc_mcontext.gregs[1]; + // The powerpc{,64}-linux ABIs do not specify r31 as the frame + // pointer, but GCC always uses r31 when we need a frame pointer. +- *bp = ucontext->uc_mcontext.regs->gpr[PT_R31]; ++ *bp = ucontext->uc_mcontext.gregs[31]; + #elif defined(__sparc__) +- ucontext_t *ucontext = (ucontext_t*)context; + uptr *stk_ptr; + # if defined (__arch64__) + *pc = ucontext->uc_mcontext.mc_gregs[MC_PC]; +@@ -1759,12 +1755,10 @@ + *bp = stk_ptr[15]; + # endif + #elif defined(__mips__) +- ucontext_t *ucontext = (ucontext_t*)context; + *pc = ucontext->uc_mcontext.pc; + *bp = ucontext->uc_mcontext.gregs[30]; + *sp = ucontext->uc_mcontext.gregs[29]; + #elif defined(__s390__) +- ucontext_t *ucontext = (ucontext_t*)context; + # if defined(__s390x__) + *pc = ucontext->uc_mcontext.psw.addr; + # else diff --git a/system/gcc/402-libsanitizer-utmp.patch b/system/gcc/402-libsanitizer-utmp.patch new file mode 100644 index 000000000..7929cd8b9 --- /dev/null +++ b/system/gcc/402-libsanitizer-utmp.patch @@ -0,0 +1,75 @@ +--- gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc.old 2018-05-31 09:58:32.000000000 +0000 ++++ gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-06-27 08:52:53.520080465 +0000 +@@ -43,9 +43,6 @@ + #include <termios.h> + #include <time.h> + #include <wchar.h> +-#if !SANITIZER_MAC && !SANITIZER_FREEBSD +-#include <utmp.h> +-#endif + + #if !SANITIZER_IOS + #include <net/route.h> +@@ -291,9 +288,6 @@ + int shmctl_shm_stat = (int)SHM_STAT; + #endif + +-#if !SANITIZER_MAC && !SANITIZER_FREEBSD +- unsigned struct_utmp_sz = sizeof(struct utmp); +-#endif + #if !SANITIZER_ANDROID + unsigned struct_utmpx_sz = sizeof(struct utmpx); + #endif +--- gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h.old 2017-10-19 11:23:59.000000000 +0000 ++++ gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h 2019-06-27 08:53:41.114993442 +0000 +@@ -873,9 +873,6 @@ + extern int shmctl_shm_stat; + #endif + +-#if !SANITIZER_MAC && !SANITIZER_FREEBSD +- extern unsigned struct_utmp_sz; +-#endif + #if !SANITIZER_ANDROID + extern unsigned struct_utmpx_sz; + #endif +--- gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc.old 2017-10-19 11:23:59.000000000 +0000 ++++ gcc-8.3.0/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc 2019-06-27 08:54:20.530780618 +0000 +@@ -6106,38 +6106,7 @@ + + // FIXME: add other *stat interceptor + +-#if SANITIZER_INTERCEPT_UTMP +-INTERCEPTOR(void *, getutent, int dummy) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, getutent, dummy); +- void *res = REAL(getutent)(dummy); +- if (res) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, __sanitizer::struct_utmp_sz); +- return res; +-} +-INTERCEPTOR(void *, getutid, void *ut) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, getutid, ut); +- void *res = REAL(getutid)(ut); +- if (res) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, __sanitizer::struct_utmp_sz); +- return res; +-} +-INTERCEPTOR(void *, getutline, void *ut) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, getutline, ut); +- void *res = REAL(getutline)(ut); +- if (res) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, __sanitizer::struct_utmp_sz); +- return res; +-} +-#define INIT_UTMP \ +- COMMON_INTERCEPT_FUNCTION(getutent); \ +- COMMON_INTERCEPT_FUNCTION(getutid); \ +- COMMON_INTERCEPT_FUNCTION(getutline); +-#else + #define INIT_UTMP +-#endif + + #if SANITIZER_INTERCEPT_UTMPX + INTERCEPTOR(void *, getutxent, int dummy) { diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index 2ab149205..5eaae5163 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -6,7 +6,7 @@ pkgver=8.3.0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="$pkgname$_target" -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="https://gcc.gnu.org" arch="all" @@ -26,7 +26,7 @@ options="$options !check !dbg strip toolchain" : ${LANG_OBJC:=true} : ${LANG_GO:=true} : ${LANG_FORTRAN:=true} -: ${LANG_ADA:=false} +: ${LANG_ADA:=true} LIBGOMP=true LIBGCC=true @@ -149,11 +149,13 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz 002_all_default-relro.patch 005_all_default-as-needed.patch + 006_as-needed-gold.patch 011_all_default-warn-format-security.patch 012_all_default-warn-trampolines.patch 020_all_msgfmt-libstdc++-link.patch 051_all_libiberty-pic.patch + 201-ada.patch 205-nopie.patch libgcc-always-build-gcceh.a.patch @@ -163,7 +165,6 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz fix-cxxflags-passing.patch ada-shared.patch - ada-musl.patch 320-libffi-gnulinux.patch 330-gccgo-link-to-ucontext.patch @@ -244,7 +245,7 @@ build() { case "$CTARGET_LIBC" in musl) - # musl does not support mudflap, or libsanitizer + # musl does not support mudflap # libmpx uses secure_getenv and struct _libc_fpstate not present in musl _libc_configure="--disable-libmpx --disable-libmudflap --disable-libsanitizer" _symvers="--disable-symvers" @@ -546,10 +547,12 @@ cd3ba928121e8578ba9f73215e4d81ee3ebbab33e00b04cdfd62b46d21f9536297ae12dc021aad6e dfedf48829cff22ee836ece743de20ad467b40e86c8f4034326a4c32df35b10affd69d6b9ab3382df2871a99ad0c2e99d4342183b59f9bca7f15112eed58ec8d 0016-invalid-tls-model.patch 625c02e03c2f1db04da12cc6a086ec85790a031a13df36486243fd9569cd17f7c8ebeec91ac16cc1f87c3ec1ffe4c421153e98a9aeb5eea35943a6f015d81f50 002_all_default-relro.patch 02b725b220e540077efef741e9d457f9e004fe53ae642a138e214875d076a60f7c2f27de0ed9a4225db2030fc9c3d2c5b0414c895b9eec0f5f48fad70e2fb029 005_all_default-as-needed.patch +9073a5ae46e46a44a77adba183db301194a3666afca07a8444a4c10dc2c087dd41d6065a051b1024454bb37bee06fabf4361e5fae62dab8d4c9620520924f606 006_as-needed-gold.patch 622fdbcbbf2feb86bd839af627ec3613c6d2c77b14d37d31165b19f73f45b3663a203efff5d224f194edb15eb62d3d5885e32f85d1b584f071e580fea4e12664 011_all_default-warn-format-security.patch 03cddde56b2a355f08716c8efcd5616606d42946c87831d77d55570636c46e351e81a04c7dabd3466d9406c40476bead857cfe1eceaf7f0d86dd2757c8cf4a9e 012_all_default-warn-trampolines.patch d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd 020_all_msgfmt-libstdc++-link.patch 0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca 051_all_libiberty-pic.patch +a3702c1f642412413d0ffc69f6439a3e101b2b56c16610f94c66556c88e52d01b0b6d1e57bfc5a972668f976c02fbf2fc22bcf707b000867e44744d9eb7b7566 201-ada.patch 98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1 205-nopie.patch d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch 600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch @@ -557,7 +560,6 @@ dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef53339 fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7 gcc-pure64.patch 35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282 fix-cxxflags-passing.patch 3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch -631d4bdef6d8bde34df7978bb53ec28c3c909cf1f87139e5f148138d0f09adc58b41ecf0148bbf50fb4bc916c411e9bf8a2b6c046c75c0e77d754d8c35bcd4d7 ada-musl.patch f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181 320-libffi-gnulinux.patch 8efd028febb962ae100be32f72f7450c4f77d67ad96a5f47072136cdf47043f9d54835a87c7ab5aaa0fa0108c4c7a97ba2d7732d5aaf2efce70fe1f7e1c39d6e 330-gccgo-link-to-ucontext.patch 24c8708f64b9b7945b3f07e9bbecf17ab8bcde2524f49cbd694ca2f6146ccc3f13bb027db282f326525ea79d50a2868fa3fa2b0d688a914b5ea77bbfd7e5cbe4 331-gccgo-use-real-off_t-type.patch diff --git a/system/gcc/ada-musl.patch b/system/gcc/ada-musl.patch deleted file mode 100644 index 464c3d57d..000000000 --- a/system/gcc/ada-musl.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -rup gcc-5.1.0/gcc.orig/ada/adaint.c gcc-5.1.0/gcc/ada/adaint.c ---- gcc-5.1.0/gcc.orig/ada/adaint.c 2015-02-20 11:48:57.000000000 +0000 -+++ gcc-5.1.0/gcc/ada/adaint.c 2015-06-02 10:47:51.672767476 +0000 -@@ -70,6 +70,11 @@ - #include <sys/param.h> - #include <sys/pstat.h> - #endif -+ -+#if defined (linux) -+#define _GNU_SOURCE 1 -+#include <sched.h> -+#endif - - #ifdef __PikeOS__ - #define __BSD_VISIBLE 1 -@@ -3057,8 +3062,6 @@ __gnat_lwp_self (void) - return (void *) syscall (__NR_gettid); - } - --#include <sched.h> -- - /* glibc versions earlier than 2.7 do not define the routines to handle - dynamically allocated CPU sets. For these targets, we use the static - versions. */ -@@ -3067,7 +3070,7 @@ __gnat_lwp_self (void) - - /* Dynamic cpu sets */ - --cpu_set_t * -+void * - __gnat_cpu_alloc (size_t count) - { - return CPU_ALLOC (count); -@@ -3080,33 +3083,33 @@ __gnat_cpu_alloc_size (size_t count) - } - - void --__gnat_cpu_free (cpu_set_t *set) -+__gnat_cpu_free (void *set) - { -- CPU_FREE (set); -+ CPU_FREE ((cpu_set_t *) set); - } - - void --__gnat_cpu_zero (size_t count, cpu_set_t *set) -+__gnat_cpu_zero (size_t count, void *set) - { -- CPU_ZERO_S (count, set); -+ CPU_ZERO_S (count, (cpu_set_t *) set); - } - - void --__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set) -+__gnat_cpu_set (int cpu, size_t count, void *set) - { - /* Ada handles CPU numbers starting from 1, while C identifies the first - CPU by a 0, so we need to adjust. */ -- CPU_SET_S (cpu - 1, count, set); -+ CPU_SET_S (cpu - 1, count, (cpu_set_t *) set); - } - - #else /* !CPU_ALLOC */ - - /* Static cpu sets */ - --cpu_set_t * -+void * - __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED) - { -- return (cpu_set_t *) xmalloc (sizeof (cpu_set_t)); -+ return xmalloc (sizeof (cpu_set_t)); - } - - size_t -@@ -3116,23 +3119,23 @@ __gnat_cpu_alloc_size (size_t count ATTR - } - - void --__gnat_cpu_free (cpu_set_t *set) -+__gnat_cpu_free (void *set) - { - free (set); - } - - void --__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set) - { -- CPU_ZERO (set); -+ CPU_ZERO ((cpu_set_t *) set); - } - - void --__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set) - { - /* Ada handles CPU numbers starting from 1, while C identifies the first - CPU by a 0, so we need to adjust. */ -- CPU_SET (cpu - 1, set); -+ CPU_SET (cpu - 1, (cpu_set_t *) set); - } - #endif /* !CPU_ALLOC */ - #endif /* linux */ -diff -rup gcc-5.1.0/gcc.orig/ada/adaint.h gcc-5.1.0/gcc/ada/adaint.h ---- gcc-5.1.0/gcc.orig/ada/adaint.h 2015-01-27 17:20:27.000000000 +0000 -+++ gcc-5.1.0/gcc/ada/adaint.h 2015-06-02 10:47:23.188910894 +0000 -@@ -287,13 +287,11 @@ extern void *__gnat_lwp_self (voi - - /* Routines for interface to required CPU set primitives */ - --#include <sched.h> -- --extern cpu_set_t *__gnat_cpu_alloc (size_t); -+extern void * __gnat_cpu_alloc (size_t); - extern size_t __gnat_cpu_alloc_size (size_t); --extern void __gnat_cpu_free (cpu_set_t *); --extern void __gnat_cpu_zero (size_t, cpu_set_t *); --extern void __gnat_cpu_set (int, size_t, cpu_set_t *); -+extern void __gnat_cpu_free (void *); -+extern void __gnat_cpu_zero (size_t, void *); -+extern void __gnat_cpu_set (int, size_t, void *); - #endif - - #if defined (_WIN32) -diff -rup gcc-5.1.0/gcc.orig/ada/gcc-interface/Makefile.in gcc-5.1.0/gcc/ada/gcc-interface/Makefile.in ---- gcc-5.1.0/gcc.orig/ada/gcc-interface/Makefile.in 2015-04-09 20:29:28.000000000 +0000 -+++ gcc-5.1.0/gcc/ada/gcc-interface/Makefile.in 2015-06-02 10:47:23.188910894 +0000 -@@ -1910,7 +1910,7 @@ ifeq ($(strip $(filter-out powerpc% linu - endif - - # ARM linux, GNU eabi --ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),) -+ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),) - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<a-intnam-linux.ads \ - s-inmaop.adb<s-inmaop-posix.adb \ diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD index 31a646011..bacb96d11 100644 --- a/system/gettys-openrc/APKBUILD +++ b/system/gettys-openrc/APKBUILD @@ -1,23 +1,24 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=gettys-openrc -pkgver=0.0.1.0 -pkgrel=3 +pkgver=0.0.2.0 +pkgrel=0 pkgdesc="Dynamic getty services" url="https://adelielinux.org/" arch="noarch" options="!check" # No test suite. license="NCSA" -depends="sysvinit execline" +depends="execline s6" source="gettys.confd gettys.initd" package() { - mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/etc/runlevels/sysinit + mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/etc/runlevels/default "$pkgdir"/etc/runlevels/nonetwork cp -f "$srcdir"/gettys.confd "$pkgdir"/etc/conf.d/gettys cp -f "$srcdir"/gettys.initd "$pkgdir"/etc/init.d/gettys chmod 0755 "$pkgdir"/etc/init.d/gettys - ln -sf ../../init.d/gettys "$pkgdir"/etc/runlevels/sysinit + ln -sf ../../init.d/gettys "$pkgdir"/etc/runlevels/default/ + ln -sf ../../init.d/gettys "$pkgdir"/etc/runlevels/nonetwork/ } sha512sums="50039958291cd546c51ce5a30d319f5c5cf7d310fb3cd9f7ad1632fa4bc55775cdac740f76886ff5869a2cfa3f345e760672cebf7727c7ca2514358bcc17e531 gettys.confd -3b4c212bba04c2a100b2e48cbbcdf561f77cb1f4e0565b8d6304315e8edce54ec7891dafc7e82fe9d30a8fad7249e8f0e337f71c4ad8ec50cc140a4e5130648f gettys.initd" +ad086549334cf2ff49bf95eb7d89aed8497a7533487aa4770d0fed884baab648c5da5f4db7ba8b7613d2dc5eea5d165a484ee7029fe660e97791f954aff171b3 gettys.initd" diff --git a/system/gettys-openrc/gettys.initd b/system/gettys-openrc/gettys.initd index cf74b0e8a..5181d9af2 100644 --- a/system/gettys-openrc/gettys.initd +++ b/system/gettys-openrc/gettys.initd @@ -14,25 +14,47 @@ makeservice() { if test -z "$baud" ; then baud=38400 fi - mkdir -p -m 0755 "/run/early-services/getty-$tty" + mkdir -p -m 0755 "/var/lib/s6/services/getty-$tty" { echo '#!/bin/execlineb -P' echo echo "/sbin/agetty $options -- $baud $tty linux" - } > "/run/early-services/getty-$tty/run" - chmod 0755 "/run/early-services/getty-$tty/run" + } > "/var/lib/s6/services/getty-$tty/run" + chmod 0755 "/var/lib/s6/services/getty-$tty/run" } -start() -{ +nomatchname() { + for j in $GETTYS ; do + if test "$j" = "$1" ; then + return 1 + fi + done + return 0 +} + +start() { set -e - mkdir -m 0755 -p /run/early-services + ebegin "Applying getty configuration" . /etc/conf.d/gettys + + todel="" + for i in `ls -1 /var/lib/s6/services | grep ^getty-` ; do + if nomatchname "${i##getty-}" ; then + rm -f "/run/service/$i" + todel="$todel $i" + fi + done + for i in $GETTYS ; do if test -c /dev/"$i" ; then - ebegin "Creating getty service for $i" - makeservice "$i" - eend $? + makeservice "$i" + ln -nsf "/var/lib/s6/services/getty-$i" "/run/service/getty-$i" fi done + + s6-svscanctl -an /run/service + if test -n "$todel" ; then + ( sleep 1 && rm -rf $todel ) & + fi + eend $? } diff --git a/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch b/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch deleted file mode 100644 index 8a51affe5..000000000 --- a/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 28747146622a49c3e7b5c5b36dc02c6a64124770 Mon Sep 17 00:00:00 2001 -From: Hans Dedecker <dedeckeh@gmail.com> -Date: Wed, 23 Jan 2019 22:02:31 +0100 -Subject: [PATCH] f_flower: fix build with musl libc - -XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it - -Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> -Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> ---- - tc/f_flower.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tc/f_flower.c b/tc/f_flower.c -index c5636667..9659e894 100644 ---- a/tc/f_flower.c -+++ b/tc/f_flower.c -@@ -14,6 +14,7 @@ - #include <unistd.h> - #include <string.h> - #include <net/if.h> -+#include <linux/limits.h> - #include <linux/if_arp.h> - #include <linux/if_ether.h> - #include <linux/ip.h> --- -2.19.2 - diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index 500a49f18..4b4b6060c 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=4.20.0 +pkgver=5.1.0 pkgrel=0 pkgdesc="IP configuration, routing, and traffic control utilities" url="https://wiki.linuxfoundation.org/networking/iproute2" @@ -10,13 +10,11 @@ arch="all" options="!check" license="GPL-2.0-only" depends="" -makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev" +makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers" install="$pkgname.post-install" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz - fix-uapi-garbage.patch - 0001-f_flower-fix-build-with-musl-libc.patch - " + devlink-sysinfo.patch" prepare() { default_prepare @@ -54,6 +52,5 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b iproute2-4.20.0.tar.xz -d9b40539f4ac074f20b0bb10381de9c3b64aadf612f0d599814cdb632fe97c76c9b4730406b08a6e53739670ca51ea0f699862156247cf20c3b7f4c78394fa46 fix-uapi-garbage.patch -b6b5dc65fb4ffff06978c160446bcc79f4f242c94d0ba44890f3b01d86640f56e7cc32efbc0b2bbfce1ae5fd40252ba9ddbb59ff91e54a4de1d4274d48260b2c 0001-f_flower-fix-build-with-musl-libc.patch" +sha512sums="5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87 iproute2-5.1.0.tar.xz +3585c70d110749e0bdba7f1bbdc32c7d635147026fbb9662f63dfcca2405e8a45cc990cb6ad38b6405cde23a1535a59ff854387ae1649b4241597ec71f445e20 devlink-sysinfo.patch" diff --git a/system/iproute2/devlink-sysinfo.patch b/system/iproute2/devlink-sysinfo.patch new file mode 100644 index 000000000..316fcefae --- /dev/null +++ b/system/iproute2/devlink-sysinfo.patch @@ -0,0 +1,43 @@ +Since commit 2f1242efe9d ("devlink: Add devlink health show command") we +use the sys/sysinfo.h header for the sysinfo(2) system call. But since +iproute2 carries a local version of the kernel struct sysinfo, this +causes a collision with libc that do not rely on kernel defined sysinfo +like musl libc: + +In file included from devlink.c:25:0: +.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo' + struct sysinfo { + ^~~~~~~ +In file included from ../include/uapi/linux/kernel.h:5:0, + from ../include/uapi/linux/netlink.h:5, + from ../include/uapi/linux/genetlink.h:6, + from devlink.c:21: +../include/uapi/linux/sysinfo.h:8:8: note: originally defined here + struct sysinfo { + ^~~~~~~ + +Rely on the kernel header alone to avoid kernel and userspace headers +collision of definitions. + +Cc: Aya Levin <ayal@xxxxxxxxxxxx> +Cc: Moshe Shemesh <moshe@xxxxxxxxxxxx> +Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx> +--- + devlink/devlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/devlink/devlink.c b/devlink/devlink.c +index 436935f88bda..d7a6ce94f0e6 100644 +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -22,7 +22,7 @@ + #include <linux/devlink.h> + #include <libmnl/libmnl.h> + #include <netinet/ether.h> +-#include <sys/sysinfo.h> ++#include <linux/sysinfo.h> + #include <sys/queue.h> + + #include "SNAPSHOT.h" +-- +2.20.1
\ No newline at end of file diff --git a/system/iproute2/fix-uapi-garbage.patch b/system/iproute2/fix-uapi-garbage.patch deleted file mode 100644 index 9f899ebb0..000000000 --- a/system/iproute2/fix-uapi-garbage.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- iproute2-4.17.0/rdma/rdma.h 2018-06-08 12:11:50.000000000 -0500
-+++ iproute2-4.17.0/rdma/rdma.h 2018-06-25 23:26:35.811455508 -0500
-@@ -16,15 +16,16 @@
- #include <errno.h>
- #include <getopt.h>
- #include <libmnl/libmnl.h>
--#include <rdma/rdma_netlink.h>
--#include <rdma/rdma_user_cm.h>
- #include <time.h>
--#include <net/if_arp.h>
-
- #include "list.h"
- #include "utils.h"
- #include "json_writer.h"
-
-+#include <rdma/rdma_netlink.h>
-+#include <rdma/rdma_user_cm.h>
-+#include <net/if_arp.h>
-+
- #define pr_err(args...) fprintf(stderr, ##args)
- #define pr_out(args...) fprintf(stdout, ##args)
-
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index efb73d48f..8287d3813 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.02 +pkgver=2.03.05 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" @@ -105,7 +105,7 @@ dm_event_libs() { mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/ } -sha512sums="b8ccd96a98bee36272492ed056aa0bd65e074e476f29d6e5562ff4604a18326cbf40a7948f2c37d8d4758a1403c3c98106f2698e1e2ba5e014e4cb91aeb3cf90 LVM2.2.03.02.tgz +sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz 6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch 33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD index b7c8a56b7..281c3248c 100644 --- a/system/lz4/APKBUILD +++ b/system/lz4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lz4 -pkgver=1.8.3 +pkgver=1.9.1 pkgrel=0 pkgdesc="LZ4: Extremely Fast Compression algorithm" url="https://github.com/lz4/lz4" @@ -27,4 +27,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f lz4-1.8.3.tar.gz" +sha512sums="536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e lz4-1.9.1.tar.gz" diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index 614ac25c7..8ef326f32 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=pcre2 -pkgver=10.32 +pkgver=10.33 pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net/" @@ -17,14 +17,11 @@ builddir="$srcdir/$pkgname-$pkgver" case "$CARCH" in s390x) _enable_jit="";; - ppc64) _enable_jit="";; pmmx) _enable_jit="";; # maybe someday fix sse2 detection *) _enable_jit="--enable-jit";; esac build() { - cd "$builddir" - # Note: Forced -O3 is recommended (needed?) for Julia. ./configure \ CFLAGS="$CFLAGS -O3" \ @@ -43,15 +40,11 @@ build() { } check() { - cd "$builddir" - ./RunTest [ ! -n "$_enable_jit" ] || ./pcre2_jit_test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install } @@ -70,4 +63,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="b0a247dc6411546f231f7588b979bc89f4c6d498a27232fb1e883d5222b9275d7b87c6afc0c67f11a453b35238dca472d14246e8bcb38df70f3701f9f3e8030f pcre2-10.32.tar.gz" +sha512sums="649983c7725e2fd2451ba89243b4c08c408fc279b7be3b2d225045cced3b0667ff6da4c9dd37510eb9e5aed6478aff54c2dbd1d92f4d0f1174579df9ec2c1882 pcre2-10.33.tar.gz" diff --git a/system/po4a/APKBUILD b/system/po4a/APKBUILD index c3bcce336..9daad6e56 100644 --- a/system/po4a/APKBUILD +++ b/system/po4a/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Christian Kampka <christian@kampka.net> # Maintainer: pkgname=po4a -pkgver=0.55 +pkgver=0.56 pkgrel=0 pkgdesc="Tools for helping translation of documentation" url="https://po4a.org" @@ -28,4 +28,4 @@ package() { find ${pkgdir} -name .packlist -o -name perllocal.pod -delete } -sha512sums="95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599 po4a-0.55.tar.gz" +sha512sums="4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1 po4a-0.56.tar.gz" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD new file mode 100644 index 000000000..70f8bbefa --- /dev/null +++ b/system/s6-linux-init/APKBUILD @@ -0,0 +1,116 @@ +# Contributor: Laurent Bercot <ska-adelie@skarnet.org> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> +pkgname=s6-linux-init +pkgver=1.0.1.0 +pkgrel=0 +pkgdesc="A s6-based init system" +url="https://skarnet.org/software/$pkgname/" +arch="all" +options="!check" # No test suite. +license="ISC" +_skalibs_version=2.8.1.0 +depends="execline s6 s6-linux-init-common" +makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" +subpackages="$pkgname-common:common:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" +provides="/sbin/init=0" + + +build() { + cd "$builddir" + ./configure \ + --enable-shared \ + --enable-static \ + --enable-allstatic \ + --enable-static-libc \ + --libdir=/usr/lib \ + --libexecdir="/lib/$pkgname" \ + --with-dynlib=/lib \ + --enable-utmps + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + + for i in rc.init runlevel rc.shutdown ; do + cp -f "$srcdir/$i" "$pkgdir/etc/s6-linux-init/skel/" + chmod 0755 "$pkgdir/etc/s6-linux-init/skel/$i" + done + + # static binaries don't work under fakeroot, so build a dynamic one just for us + touch src/init/s6-linux-init-maker.o + make s6-linux-init-maker LDFLAGS_NOSHARED="" + + ./s6-linux-init-maker \ + -u catchlog \ + -1 \ + -L \ + -p "/usr/bin:/usr/sbin:/bin:/sbin" \ + -m 022 \ + -s /run/kernel_env \ + -f "$pkgdir/etc/s6-linux-init/skel" \ + -U "" \ + "$pkgdir/etc/s6-linux-init/current" + mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" "$pkgdir/etc/sysctl.d" + echo 'kernel.ctrl-alt-del = 0' > "$pkgdir/etc/sysctl.d/ctrlaltdel.conf" + for i in init halt poweroff reboot shutdown telinit ; do + ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i" + done +} + + +common() { + pkgdesc="Files for an s6 supervision tree, common to s6-linux-init and sysvinit" + depends="execline s6" + runimg="$pkgdir/etc/s6-linux-init/current/run-image" + subrunimg="$subpkgdir/etc/s6-linux-init/current/run-image" + install="$subpkgname.post-upgrade $subpkgname.pre-deinstall" + mkdir -p -m 0755 "$subrunimg/service/.s6-svscan" "$subrunimg/service/s6-svscan-log" "$subpkgdir/usr/share/s6-linux-init-common" + mv "$runimg/uncaught-logs" "$subrunimg/" + mv "$runimg/service/s6-svscan-log" "$subrunimg/service/" + mkdir -m 0755 "$runimg/service/s6-svscan-log" + mv "$subrunimg/service/s6-svscan-log/run" "$runimg/service/s6-svscan-log/" + cp -f "$srcdir/reboot.sh" "$subpkgdir/usr/share/s6-linux-init-common/" +} + + +libs() { + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/lib" + mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/" +} + + +dev() { + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + mkdir -p "$subpkgdir/usr" + mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/" +} + + +libsdev() { + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/lib" + mv "$pkgdir"/lib/*.so "$subpkgdir/lib/" +} + + +doc() { + pkgdesc="$pkgdesc (documentation)" + depends= + install_if="docs $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" +} + +sha512sums="0b40601b25f88464b5ff63b7eddf6ffa30eb868d2d9652f3d6a608b8f508e46712214d6e674f74136e57dd4504eb71ef585c725ba1a6566cfc0a025e70cfadc9 s6-linux-init-1.0.1.0.tar.gz +756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init +e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel +7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown +de702d3a221993cd3192dae4544842402dfbe362bcc4105f3071df15eb0aa6c218bf401bbf221298ee063f6545fe909fd54abf1d1e9222e13bcdc9a29f9a2b19 reboot.sh" diff --git a/system/s6-linux-init/rc.init b/system/s6-linux-init/rc.init new file mode 100644 index 000000000..f96ed4d5e --- /dev/null +++ b/system/s6-linux-init/rc.init @@ -0,0 +1,9 @@ +#!/bin/sh -e + +rl="$1" +shift + +/sbin/openrc sysinit +/sbin/openrc boot + +exec /etc/s6-linux-init/current/scripts/runlevel "$rl" diff --git a/system/s6-linux-init/rc.shutdown b/system/s6-linux-init/rc.shutdown new file mode 100644 index 000000000..6fa64f6bc --- /dev/null +++ b/system/s6-linux-init/rc.shutdown @@ -0,0 +1,3 @@ +#!/bin/sh -e + +exec /sbin/openrc empty diff --git a/system/s6-linux-init/reboot.sh b/system/s6-linux-init/reboot.sh new file mode 100644 index 000000000..d0d87aeb6 --- /dev/null +++ b/system/s6-linux-init/reboot.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# This script performs a "poor man's reboot" when the +# init infrastructures are not there to do a proper one. +# This is the case when the user *just* switched between +# sysvinit and s6-linux-init, and needs to shut down the +# old system but the shutdown binaries are the ones from +# the new system. +# +# Always launch it from a console tty (tty1, ... tty6), +# never from a network terminal or an xterm. + +trap "" INT HUP TERM +mkdir -p -m 0755 /etc/runlevels/empty2 +/sbin/openrc empty2 +rmdir /etc/runlevels/empty2 +sync +/etc/init.d/killprocs start +/etc/init.d/savecache start +/etc/init.d/mount-ro start +/sbin/reboot -f diff --git a/system/s6-linux-init/runlevel b/system/s6-linux-init/runlevel new file mode 100644 index 000000000..f34018ea2 --- /dev/null +++ b/system/s6-linux-init/runlevel @@ -0,0 +1,5 @@ +#!/bin/sh -e + +test "$#" -gt 0 || { echo 'runlevel: fatal: too few arguments' 1>&2 ; exit 100 ; } + +exec /sbin/openrc "$1" diff --git a/system/s6-linux-init/s6-linux-init-common.post-upgrade b/system/s6-linux-init/s6-linux-init-common.post-upgrade new file mode 100644 index 000000000..335559a3c --- /dev/null +++ b/system/s6-linux-init/s6-linux-init-common.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh -e + +# apk does not handle fifos correctly. + +exec rm -f /etc/s6-linux-init/current/run-image/service/s6-svscan-log/fifo.apk-new diff --git a/system/s6-linux-init/s6-linux-init-common.pre-deinstall b/system/s6-linux-init/s6-linux-init-common.pre-deinstall new file mode 100644 index 000000000..691e2cca0 --- /dev/null +++ b/system/s6-linux-init/s6-linux-init-common.pre-deinstall @@ -0,0 +1,5 @@ +#!/bin/sh -e + +# apk does not handle fifos correctly. + +exec rm -f /etc/s6-linux-init/current/run-image/service/s6-svscan-log/fifo diff --git a/system/s6-linux-init/s6-linux-init.post-install b/system/s6-linux-init/s6-linux-init.post-install new file mode 100644 index 000000000..8e24f6d42 --- /dev/null +++ b/system/s6-linux-init/s6-linux-init.post-install @@ -0,0 +1,25 @@ +#!/bin/sh -e + +newv="$1" +oldv="$2" + +cat <<EOF + +* +* You installed the s6-linux-init package. If it's your first installation, +* please ignore this message. But if you just removed the sysvinit +* package in order to use s6-linux-init instead, please read on. +* +* In order to complete the switch, you need to reboot your machine. But +* beware: just for this time, the usual shutdown commands won't work, +* because they are designed to work with s6-linux-init but you are still +* running sysvinit until you reboot. So, for your next reboot (and +* only this one), the command you will need to run (as root, FROM A +* CONSOLE TTY - not an xterm, not a network connection) is: +* +* /bin/sh /usr/share/s6-linux-init-common/reboot.sh +* +* Please save your work and perform that reboot as soon as you can. +* + +EOF diff --git a/system/s6-linux-init/s6-linux-init.post-upgrade b/system/s6-linux-init/s6-linux-init.post-upgrade new file mode 100644 index 000000000..322de1e6b --- /dev/null +++ b/system/s6-linux-init/s6-linux-init.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh -e + +# apk does not handle fifos correctly. + +exec rm -f /etc/s6-linux-init/current/run-image/service/s6-linux-init-shutdownd/fifo.apk-new diff --git a/system/s6-linux-init/s6-linux-init.pre-deinstall b/system/s6-linux-init/s6-linux-init.pre-deinstall new file mode 100644 index 000000000..bc72c70a0 --- /dev/null +++ b/system/s6-linux-init/s6-linux-init.pre-deinstall @@ -0,0 +1,5 @@ +#!/bin/sh -e + +# apk does not handle fifos correctly. + +exec rm -f /etc/s6-linux-init/current/run-image/service/s6-linux-init-shutdownd/fifo diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index d160e104f..ad5f1f28f 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.8.0.0 -pkgrel=0 +pkgver=2.8.0.1 +pkgrel=1 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.8 +_skalibs_version=2.8.1.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" triggers="$pkgname.trigger=/run/service" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz - s6-svscanboot" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { cd "$builddir" @@ -33,9 +32,7 @@ build() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot" - mkdir -p -m 0755 "$pkgdir/etc/s6/early-services" "$pkgdir/var/lib/s6/services" - chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" + mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" } @@ -71,5 +68,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="e2f2f0fb9481a745fc80b3b8c0aa2de979c0c8dbe066e2402cf7700a08edc32448d7ed3065a19a01a18dc5a12f3abcfd3aba5d2c5fefbbf49fee4a6f8396c106 s6-2.8.0.0.tar.gz -9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac s6-svscanboot" +sha512sums="03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f s6-2.8.0.1.tar.gz" diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot deleted file mode 100644 index 32eb5f290..000000000 --- a/system/s6/s6-svscanboot +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/execlineb -P - -# Basic sanity. - -export PATH /usr/bin:/usr/sbin:/bin:/sbin -umask 022 - - -# The live service directories are in /run/services -# The scandir is /run/service, containing only the catch-all logger and symlinks -# (and the s6-svscan configuration in /run/service/.s6-svscan) - -if { rm -rf /run/service /run/services } -if { mkdir -p -m 0755 /run/service/.s6-svscan /run/service/s6-svscan-log } -if -{ - redirfd -w 1 /run/service/.s6-svscan/crash - heredoc 0 "#!/bin/execlineb -P\nfalse\n" - cat -} -if -{ - redirfd -w 1 /run/service/.s6-svscan/finish - heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"/run/service/s6-svscan-log\"\n" - cat -} -if { cd /run/service/.s6-svscan chmod 0755 crash finish } - - -# Directory for the catch-all logger to store its logs - -if { mkdir -p -m 2700 /run/uncaught-logs } -if { chown catchlog:catchlog /run/uncaught-logs } -if { chmod 2700 /run/uncaught-logs } - - -# Copy all the early services and link them into the scandir - -if { /bin/cp -a /etc/s6/early-services /run/services } -if -{ - forbacktickx -pnd"\n" i { ls -1 -U /run/services } - importas -u i i - ln -nsf ../services/$i /run/service/$i -} - - -# Also link the early services defined in sysinit, if any - -if -{ - if -t { test -d /run/early-services } - forbacktickx -pnd"\n" i { ls -1 -U /run/early-services } - importas -u i i - ln -nsf ../early-services/$i /run/service/$i -} - - -# Create the catch-all logger servicedir directly in the scandir -# (It's too fundamental to be made configurable as an early service.) - -if { rm -f /run/service/s6-svscan-log/fifo } -if { mkfifo -m 0600 /run/service/s6-svscan-log/fifo } -if -{ - redirfd -w 1 /run/service/s6-svscan-log/run - heredoc 0 "#!/bin/execlineb -P -redirfd -w 2 /dev/console -redirfd -rnb 0 fifo -s6-setuidgid catchlog -exec -c -s6-log t /run/uncaught-logs\n" - cat -} -if { chmod 0755 /run/service/s6-svscan-log/run } - - -# All ready, exec into s6-svscan. -# By default all messages from all services will go to the catch-all logger it spawns. - -redirfd -r 0 /dev/null -redirfd -wnb 1 /run/service/s6-svscan-log/fifo -fdmove -c 2 1 -s6-svscan -St0 /run/service diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 0b69f49e7..26d289c27 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,8 +1,13 @@ #!/bin/sh -e +newv="$1" +oldv="$2" + rm -f /etc/runlevels/default/s6 -cat <<EOF +if test `apk version -t "$oldv" 2.8` = "<" ; then + + cat <<EOF * * The s6 package has been upgraded. To complete the upgrade, you need to @@ -16,3 +21,4 @@ cat <<EOF * EOF +fi diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index 2440cfba5..a55906f6d 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.8.0.1 +pkgver=2.8.1.0 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -59,4 +59,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="7cb750581cd8f062a99e9ff96ad47a55d2b6284e6c9deffd63278a426a7f961eeee60c0557bd0dca0a0b4d4e3d3b26f65ee101e86558f0c08161f6079b757fef skalibs-2.8.0.1.tar.gz" +sha512sums="d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86 skalibs-2.8.1.0.tar.gz" diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD index d282e1e01..b95525084 100644 --- a/system/sysvinit/APKBUILD +++ b/system/sysvinit/APKBUILD @@ -2,21 +2,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=5 +pkgrel=6 pkgdesc="System V-style init programs" url="https://savannah.nongnu.org/projects/sysvinit" arch="all" license="GPL-2.0+" -depends="s6" +depends="s6-linux-init-common" makedepends="linux-headers utmps-dev" -install="sysvinit.post-upgrade" +install="sysvinit.post-upgrade sysvinit.post-install" options="!check" -provides="/sbin/init" +provides="/sbin/init=0" subpackages="$pkgname-doc" source="https://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2 inittab-2.88 sysvinit-2.88-posix-header.patch utmpx.patch + s6-svscanboot " builddir="$srcdir/sysvinit-${pkgver}dsf" @@ -49,14 +50,30 @@ build() { make -C src } +_install_s6_stuff() +{ + svcimg="$pkgdir/etc/s6-linux-init/current/run-image/service" + mkdir -p -m 0755 "$pkgdir/sbin" "$svcimg/.s6-svscan" "$svcimg/s6-svscan-log" + { echo '#!/bin/execlineb -P' ; echo 'false' ; } > "$svcimg/.s6-svscan/crash" + chmod 0755 "$svcimg/.s6-svscan/crash" + { echo '#!/bin/execlineb -P' ; echo 's6-svc -X -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish" + chmod 0755 "$svcimg/.s6-svscan/finish" + { echo '#!/bin/execlineb -P' ; echo 'redirfd -rnb 0 fifo' ; echo 's6-setuidgid catchlog' ; echo 's6-log -bd3 -- t /run/uncaught-logs' ; } > "$svcimg/s6-svscan-log/run" + chmod 0755 "$svcimg/s6-svscan-log/run" + install -D -m 0755 "$srcdir"/s6-svscanboot "$pkgdir/sbin/s6-svscanboot" +} + package() { cd "$builddir" make -C src install ROOT="$pkgdir" rm "$pkgdir"/usr/bin/lastb || true install -D -m644 "$srcdir"/inittab-2.88 "$pkgdir"/etc/inittab + _install_s6_stuff } + sha512sums="0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf sysvinit-2.88dsf.tar.bz2 -52d301225bf0cb0c4d124d205cf3a1e1f4eca21a69179da4882359f79606562354fddf887da8203129bede1d073efa9cdd8fe84a327b51229248b22240b9d5dd inittab-2.88 +87668b49690091a227c0384fd2400f1006d24c27cc27a25efa7eba56839ccb1eead00b58ce4b654eab9c0208d68aa2cbb888fd5f2990905845aa9688442a69a0 inittab-2.88 27dfe089660a291cbcba06d8564bad11f7fd7c96629e72c2b005562689dc7d8bb479c760e980590906e98423b991ae0acd048713d3bc372174d55ed894abeb3f sysvinit-2.88-posix-header.patch -3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae utmpx.patch" +3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae utmpx.patch +30fc01b99350d9cb9e2d430f32c357fce571864e618f25fc2c82199f0ae36f3d81316b175af37ff779c0ef26780452877ff0355b3ea47e2ef4eadc823d085e98 s6-svscanboot" diff --git a/system/sysvinit/inittab-2.88 b/system/sysvinit/inittab-2.88 index e96205a06..f170042cf 100644 --- a/system/sysvinit/inittab-2.88 +++ b/system/sysvinit/inittab-2.88 @@ -16,30 +16,36 @@ # Default runlevel. id:3:initdefault: -# System initialization, mount local filesystems, etc. +# Early system initialization. si::sysinit:/sbin/openrc sysinit -# Further system initialization, brings up the boot runlevel. +# Further system initialization. +# The distinction between sysinit and boot is totally arbitrary. +# With the current OpenRC, sysinit does almost nothing and boot +# does almost everything. rc::bootwait:/sbin/openrc boot +# Start the s6 supervision tree. +s6:12345:respawn:/sbin/s6-svscanboot + +# Wait for the supervision tree to be operational before launching services. +s6n:12345:wait:/bin/sh -c 'until test -s /run/s6_ready ; do sleep 1 ; done' + l0:0:wait:/sbin/openrc shutdown -l0s:0:wait:/sbin/halt -hnp +l0s:0:wait:/sbin/poweroff -df l1:1:wait:/sbin/openrc single l2:2:wait:/sbin/openrc nonetwork l3:3:wait:/sbin/openrc default l4:4:wait:/sbin/openrc default l5:5:wait:/sbin/openrc default l6:6:wait:/sbin/openrc reboot -l6r:6:wait:/sbin/reboot -fin +l6r:6:wait:/sbin/reboot -df #z6:6:respawn:/sbin/sulogin # new-style single-user su0:S:wait:/sbin/openrc single su1:S:wait:/sbin/sulogin -# We now delegate all "respawn" services, including terminals, to s6. -s6:12345:respawn:/lib/s6/s6-svscanboot - # What to do at the "Three Finger Salute". ca:12345:ctrlaltdel:/sbin/shutdown -r now diff --git a/system/sysvinit/s6-svscanboot b/system/sysvinit/s6-svscanboot new file mode 100644 index 000000000..8c134b485 --- /dev/null +++ b/system/sysvinit/s6-svscanboot @@ -0,0 +1,15 @@ +#!/bin/execlineb -P + +define RUNIMG /etc/s6-linux-init/current/run-image +export PATH /usr/bin:/usr/sbin:/bin:/sbin +umask 022 +redirfd -r 0 /dev/null +if +{ + elglob -0 files ${RUNIMG}/* + cp -a $files /run/ +} +redirfd -w 3 /run/s6_ready +redirfd -wnb 1 /run/service/s6-svscan-log/fifo +fdmove -c 2 1 +s6-svscan -St0 -d3 /run/service diff --git a/system/sysvinit/sysvinit.post-install b/system/sysvinit/sysvinit.post-install new file mode 100644 index 000000000..4548041d9 --- /dev/null +++ b/system/sysvinit/sysvinit.post-install @@ -0,0 +1,25 @@ +#!/bin/sh -e + +newv="$1" +oldv="$2" + +cat <<EOF + +* +* You installed the sysvinit package. If it's your first installation, +* please ignore this message. But if you just removed the s6-linux-init +* package in order to use sysvinit instead, please read on. +* +* In order to complete the switch, you need to reboot your machine. But +* beware: just for this time, the usual shutdown commands won't work, +* because they are designed to work with sysvinit but you are still +* running s6-linux-init until you reboot. So, for your next reboot (and +* only this one), the command you will need to run (as root, FROM A +* CONSOLE TTY - not an xterm, not a network connection) is: +* +* /bin/sh /usr/share/s6-linux-init-common/reboot.sh +* +* Please save your work and perform that reboot as soon as you can. +* + +EOF diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 9ce4c0dda..78d3a176e 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps pkgver=0.0.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -33,12 +33,14 @@ build() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p -m 0755 "$pkgdir/etc/s6/early-services/utmpd" "$pkgdir/etc/s6/early-services/wtmpd" - cp -f "$srcdir/utmpd.run" "$pkgdir/etc/s6/early-services/utmpd/run" - echo 3 > "$pkgdir/etc/s6/early-services/utmpd/notification-fd" - cp -f "$srcdir/wtmpd.run" "$pkgdir/etc/s6/early-services/wtmpd/run" - echo 3 > "$pkgdir/etc/s6/early-services/wtmpd/notification-fd" - chmod 0755 "$pkgdir/etc/s6/early-services/utmpd/run" "$pkgdir/etc/s6/early-services/wtmpd/run" + runimage="$pkgdir/etc/s6-linux-init/current/run-image" + mkdir -p -m 0755 "$runimage/utmps" "$runimage/service/utmpd" "$runimage/service/wtmpd" + chown utmp:utmp "$runimage/utmps" + cp -f "$srcdir/utmpd.run" "$runimage/service/utmpd/run" + echo 3 > "$runimage/service/utmpd/notification-fd" + cp -f "$srcdir/wtmpd.run" "$runimage/service/wtmpd/run" + echo 3 > "$runimage/service/wtmpd/notification-fd" + chmod 0755 "$runimage/service/utmpd/run" "$runimage/service/wtmpd/run" } @@ -75,5 +77,5 @@ doc() { } sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz -525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run -93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run" +0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run +cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/system/utmps/utmpd.run b/system/utmps/utmpd.run index 5d66c183c..47bc824a2 100644 --- a/system/utmps/utmpd.run +++ b/system/utmps/utmpd.run @@ -1,8 +1,6 @@ #!/bin/execlineb -P fdmove -c 2 1 -if { mkdir -p -m 0755 /run/utmps } -if { chown utmp:utmp /run/utmps } s6-setuidgid utmp cd /run/utmps fdmove 1 3 diff --git a/system/utmps/wtmpd.run b/system/utmps/wtmpd.run index fa78806c9..ab5a40641 100644 --- a/system/utmps/wtmpd.run +++ b/system/utmps/wtmpd.run @@ -1,8 +1,6 @@ #!/bin/execlineb -P fdmove -c 2 1 -if { mkdir -p -m 0755 /run/utmps } -if { chown utmp:utmp /run/utmps } s6-setuidgid utmp cd /run/utmps fdmove 1 3 diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 7e0b38e15..41eca142e 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.13.3 +pkgver=9.14.3 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -24,7 +24,7 @@ options="!check" license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause" pkgusers="named" pkggroups="named" -makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev" +makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools" source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz @@ -40,6 +40,13 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.14.3: +# - CVE-2018-5744 +# - CVE-2018-5745 +# - CVE-2019-6465 +# - CVE-2018-5743 +# - CVE-2019-6467 +# - CVE-2019-6471 # 9.13.3: # - CVE-2018-5741 # - CVE-2018-5740 @@ -147,7 +154,7 @@ tools() { done } -sha512sums="980f294ef7b75c9a0917212e26300037ad6a33ff3565c099a6bad15350f0738491396a22a40dd552efd7fd25634f82f236abca4f83b4c8a9c580099851dd3c83 bind-9.13.3.tar.gz +sha512sums="46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437 bind-9.14.3.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index dc2fe5d4f..46516b598 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony -pkgver=3.4 -pkgrel=1 +pkgver=3.5 +pkgrel=0 _ver=${pkgver/_/-} pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" @@ -20,7 +20,6 @@ subpackages="$pkgname-doc $pkgname-openrc" source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz fix-tests.patch max_resolve_interval.patch - chrony-include-util.patch chronyd.confd chronyd.initd chrony.logrotate @@ -90,10 +89,9 @@ package() { chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony } -sha512sums="4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 chrony-3.4.tar.gz +sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c chrony-3.5.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch -30f1ed28e0d956c994abd770c68634c7d5c69ded04a2fbfd387bbd8009bc0102ce57934ce41e468fc6b2c7f8fefdab73d97f6d6ff39ec93fffa6575fa1451fbd chrony-include-util.patch 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de chronyd.confd 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate diff --git a/user/chrony/chrony-include-util.patch b/user/chrony/chrony-include-util.patch deleted file mode 100644 index 20b43c187..000000000 --- a/user/chrony/chrony-include-util.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- chrony-3.4/hash_intmd5.c.old 2018-09-27 19:29:57.386348229 -0700 -+++ chrony-3.4/hash_intmd5.c 2018-09-27 19:30:07.696494803 -0700 -@@ -29,6 +29,7 @@ - #include "sysincl.h" - #include "hash.h" - #include "memory.h" -+#include "util.h" - - #include "md5.c" - diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD index f1c42d607..6fd0c0a02 100644 --- a/user/ddrescue/APKBUILD +++ b/user/ddrescue/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ddrescue -pkgver=1.23 +pkgver=1.24 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="https://www.gnu.org/s/ddrescue/ddrescue.html" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656 ddrescue-1.23.tar.lz" +sha512sums="2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa ddrescue-1.24.tar.lz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index e42405db5..7dc1343f9 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=7.0.8 +pkgver=7.2.2 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -47,6 +47,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953 dhcpcd-7.0.8.tar.xz +sha512sums="a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8 dhcpcd-7.2.2.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/dmenu/APKBUILD b/user/dmenu/APKBUILD index 39a27bc5a..ec90c9934 100644 --- a/user/dmenu/APKBUILD +++ b/user/dmenu/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dmenu -pkgver=4.8 +pkgver=4.9 pkgrel=0 pkgdesc="Dynamic menu for X" url="https://tools.suckless.org/dmenu/" @@ -33,4 +33,4 @@ package() { -C "$builddir" install } -sha512sums="fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 dmenu-4.8.tar.gz" +sha512sums="c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 dmenu-4.9.tar.gz" diff --git a/experimental/erlang/APKBUILD b/user/erlang/APKBUILD index 82832e96e..278c66a5d 100644 --- a/experimental/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -8,9 +8,9 @@ url="https://www.erlang.org/" arch="all" license="Apache-2.0" depends="" -makedepends="libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl +makedepends="flex libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl unixodbc-dev" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev" source="http://erlang.org/download/otp_src_$pkgver.tar.gz fix-wx-linking.patch " diff --git a/experimental/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch index eb5649164..eb5649164 100644 --- a/experimental/erlang/fix-wx-linking.patch +++ b/user/erlang/fix-wx-linking.patch diff --git a/user/guile/APKBUILD b/user/guile/APKBUILD index 6013fd375..024ac6c22 100644 --- a/user/guile/APKBUILD +++ b/user/guile/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=guile -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=0 pkgdesc="Portable, embeddable Scheme implementation written in C" url="https://www.gnu.org/software/guile/" @@ -17,7 +17,6 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,10 +27,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/charset.alias } -sha512sums="a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e guile-2.2.4.tar.gz +sha512sums="1c07a6d16e00953d416bd8db5b1e9574c62751f745c203de5a910b9688cf93756fe2303ab084d9e9949bff11e6e14909304ecd1ef671be2a06c7c3f292f6380c guile-2.2.5.tar.gz b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch" diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 59c94e802..7b8bd9469 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.15 +pkgver=4.16.1 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -43,7 +43,7 @@ package() { install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4 i3-4.15.tar.bz2 -8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299 i3wm-musl-glob-tilde.patch +sha512sums="3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0 i3-4.16.1.tar.bz2 +6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" diff --git a/user/i3wm/i3wm-musl-glob-tilde.patch b/user/i3wm/i3wm-musl-glob-tilde.patch index 82ad6195b..d4c2d832e 100644 --- a/user/i3wm/i3wm-musl-glob-tilde.patch +++ b/user/i3wm/i3wm-musl-glob-tilde.patch @@ -4,7 +4,7 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c @@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) { * */ - char *expand_path(char *path) { + static char *expand_path(char *path) { - static glob_t globbuf; - if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) { - ELOG("glob() failed\n"); @@ -28,11 +28,11 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c + return sstrdup(path); } - void print_usage(char *elf_name) { + static void print_usage(char *elf_name) { diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c --- i3-4.11/libi3/resolve_tilde.c 2015-09-30 07:55:10.000000000 +0100 +++ i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +0000 -@@ -19,27 +19,18 @@ +@@ -19,28 +19,18 @@ * */ char *resolve_tilde(const char *path) { @@ -53,9 +53,9 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c - } else { - head = globbuf.gl_pathv[0]; - result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1); -- strncpy(result, head, strlen(head)); -- if (tail) -- strncat(result, tail, strlen(tail)); +- strcpy(result, head); +- if (tail) { +- strcat(result, tail); + if (strncmp(path, "~/", 2) == 0) { + home = getenv("HOME"); + if (home != NULL) { @@ -64,7 +64,7 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c + strcpy(expanded, home); + strcat(expanded, path+1); + return expanded; -+ } + } } - globfree(&globbuf); diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD index b2eb2284b..db1fd9f55 100644 --- a/user/imake/APKBUILD +++ b/user/imake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=imake -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="X Windows make utility" url="https://www.x.org" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08 imake-1.0.7.tar.bz2" +sha512sums="5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728 imake-1.0.8.tar.bz2" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index 1e1fad965..906d8cd30 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.6 +pkgver=3.7 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -17,9 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgnam $_pkgname.initd $_pkgname.confd - build-fixes.patch - remove-pg-flags.patch - " + build-fixes.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -31,7 +29,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + --disable-profiling make } @@ -50,8 +49,7 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="322a6893ad28c6ce9c9849e8a0326408ed76f09bbb13591c01c3d051bd4777a2acdb8f5032b9d1bb37d47ad3818d8b18ab6c0be4d40559040eb7e57bbfc06f39 iperf3-3.6.tar.gz +sha512sums="9b8d1ac6bdebb00e38e196db9a71ae6ff3b8b763cd4b1336d078c31f6d0a5ab53bbe70ba949c601af5efe674dbd032ed5d58a761d5159dae4e50122b68a8f086 iperf3-3.7.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd -126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch -ed0fb3a3af0dae3e9f58ff6643cb15defdd31f65cf966a6013fdf2a7fd67a7f8ef522a7c8f3269bd43d5ca991a86d758526c384ebc0984b1403bb24f61a1779b remove-pg-flags.patch" +126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" diff --git a/user/iperf3/remove-pg-flags.patch b/user/iperf3/remove-pg-flags.patch deleted file mode 100644 index 1ed47eebf..000000000 --- a/user/iperf3/remove-pg-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -50,9 +50,9 @@ - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -643,9 +643,9 @@ - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD index fc6b1b3e6..4a35f931b 100644 --- a/user/iputils/APKBUILD +++ b/user/iputils/APKBUILD @@ -1,55 +1,42 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iputils -pkgver=20180629 +pkgver=20190515 pkgrel=0 pkgdesc="IP Configuration Utilities (and Ping)" url="https://github.com/iputils/iputils/" arch="all" license="BSD-3-Clause AND GPL-2.0-or-later" -makedepends="libcap-dev openssl-dev libxslt docbook-xsl" +makedepends="meson libcap-dev libxslt docbook-xsl-ns openssl-dev libgcrypt-dev" replaces="bbsuid" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc" source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz - time.patch - fix-init-of-cmsg.patch - fix-idn.patch + docbook-man.patch " -options="!check suid" # there is no testsuite for these applications +options="suid" builddir="$srcdir/$pkgname-s$pkgver" build() { cd "$builddir" # we're waiting for idn support in musl so that we can enable it here # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Name-Resolver/DNS - make all ninfod USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/usr/include - make man + meson --prefix /usr --buildtype=plain builddir -DUSE_IDN=false + ninja -v -C builddir } -package() { - local name +check() { cd "$builddir" + ninja -C builddir test +} - for name in arping clockdiff ipg rarpd rdisc tftpd tracepath; do - install -D -m755 $name "$pkgdir"/usr/sbin/$name - done - install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod - - for name in ping traceroute6; do - install -D -m4755 $name "$pkgdir"/bin/$name - done +package() { + cd "$builddir" - mkdir -p "$pkgdir"/usr/share/man/man8 - for doc in ./doc/*.8; do - gzip $doc - install -m644 "$doc".gz "$pkgdir"/usr/share/man/man8/ - done + DESTDIR=$pkgdir ninja -C builddir install - ln -s tracepath "$pkgdir"/usr/sbin/tracepath6 - ln -s ping "$pkgdir"/bin/ping6 + ln -s tracepath "$pkgdir"/usr/bin/tracepath6 + ln -s ping "$pkgdir"/usr/bin/ping6 } -sha512sums="16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 iputils-20180629.tgz -530532d16574921d0789af6a82706915e8103e712195c4f2eb6379192cc7126ba6bc9f33e8454118628d59f8932ffd2bb5aaba3b61fa93df83088e3b0d93d227 time.patch -2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch -b3a5e5ef9ed1ed12a137f176db6a444f15db67dfaef3706514bc4d0cd2a332fb8aeeae0460fca8a1dfef2e0ce2ae0cf2218a74e3f61c46fcb27715a030425ac0 fix-idn.patch" +sha512sums="adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250 iputils-20190515.tgz +411f45a2d16c88b09f3547e3f04aa20e257f54650c7783123e4cb021bd8850cd96896480fbf9305d6df72abe32d8d5c2239ce4ac4ef9bfa821c205309451d6ff docbook-man.patch" diff --git a/user/iputils/docbook-man.patch b/user/iputils/docbook-man.patch new file mode 100644 index 000000000..1793858e4 --- /dev/null +++ b/user/iputils/docbook-man.patch @@ -0,0 +1,33 @@ +--- iputils-s20190515/doc/custom-man.xsl.old 2019-06-25 11:48:48.790000000 +0000 ++++ iputils-s20190515/doc/custom-man.xsl 2019-06-25 11:49:06.250000000 +0000 +@@ -5,7 +5,7 @@ + extension-element-prefixes="exsl" + version="1.0"> + +-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/> ++<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl"/> + + <xsl:template name="top.comment" /> + +--- iputils-s20190515/doc/meson.build.old 2019-06-25 14:54:58.170000000 +0000 ++++ iputils-s20190515/doc/meson.build 2019-06-25 14:55:28.460000000 +0000 +@@ -48,7 +48,7 @@ + ] + + if xsltproc.found() +- xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ xsl = 'file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl' + testrun = run_command([xsltproc, '--nonet', xsl]) + xsltproc_works = testrun.returncode() == 0 + if xsltproc_works == false +--- iputils-s20190515/doc/custom-html.xsl.old 2019-06-25 14:56:50.460000000 +0000 ++++ iputils-s20190515/doc/custom-html.xsl 2019-06-25 14:57:11.680000000 +0000 +@@ -2,7 +2,7 @@ + + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + +-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/> ++<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/html/docbook.xsl"/> + <!-- + - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID. + - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values. diff --git a/user/iputils/fix-idn.patch b/user/iputils/fix-idn.patch deleted file mode 100644 index 4aaae8e82..000000000 --- a/user/iputils/fix-idn.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- iputils-s20180629/ping.c.orig 2018-06-29 11:00:46.000000000 -0700 -+++ iputils-s20180629/ping.c 2018-07-06 01:09:10.479830175 -0700 -@@ -207,9 +210,10 @@ - - #ifdef USE_IDN - setlocale(LC_ALL, ""); --#endif -+ - if (!strcmp(setlocale(LC_ALL, NULL), "C")) - hints.ai_flags &= ~ AI_CANONIDN; -+#endif - - /* Support being called using `ping4` or `ping6` symlinks */ - if (argv[0][strlen(argv[0])-1] == '4') diff --git a/user/iputils/fix-init-of-cmsg.patch b/user/iputils/fix-init-of-cmsg.patch deleted file mode 100644 index 76ebc16c2..000000000 --- a/user/iputils/fix-init-of-cmsg.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes ping on s390x. - -diff --git a/ping.c b/ping.c -index a0857a1..329553d 100644 ---- a/ping.c -+++ b/ping.c -@@ -108,8 +108,11 @@ static int parsetos(char *str); - static struct { - struct cmsghdr cm; - struct in_pktinfo ipi; --} cmsg = { {sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), SOL_IP, IP_PKTINFO}, -- {0, }}; -+} cmsg = { .cm = { -+ .cmsg_len = sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), -+ .cmsg_level = SOL_IP, -+ .cmsg_type = IP_PKTINFO}, -+ .ipi = {0, }}; - int cmsg_len; - - struct sockaddr_in source; diff --git a/user/iputils/time.patch b/user/iputils/time.patch deleted file mode 100644 index 1d6033f7a..000000000 --- a/user/iputils/time.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./tracepath.c.orig -+++ ./tracepath.c -@@ -12,6 +12,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <time.h> - #include <sys/socket.h> - #include <linux/types.h> - #include <linux/errqueue.h> diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD index b08fa94db..ee0936554 100644 --- a/user/libidn2/APKBUILD +++ b/user/libidn2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libidn2 -pkgver=2.0.5 -pkgrel=1 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46" url="https://gitlab.com/libidn/libidn2" arch="all" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 libidn2-2.0.5.tar.gz" +sha512sums="ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8 libidn2-2.2.0.tar.gz" diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index de4969ac7..b86bfda2b 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -101,7 +101,7 @@ build() { -DLLVM_HOST_TRIPLE="$CHOST" \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Mips;PowerPC;Sparc;SystemZ;WebAssembly;X86' \ + -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;Sparc;SystemZ;WebAssembly;X86;XCore' \ "$builddir" make llvm-tblgen diff --git a/user/musl-locales/APKBUILD b/user/musl-locales/APKBUILD new file mode 100644 index 000000000..9bbf0c49b --- /dev/null +++ b/user/musl-locales/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Alyx <alyx@leuhta.com> +# Maintainer: Alyx <alyx@leuhta.com> +pkgname=musl-locales +pkgver=0.20190626 +pkgrel=0 +pkgdesc="Locale program for musl" +url="https://gitlab.com/rilian-la-te/musl-locales" +arch="all" +options="!check" # No test suite. +license="MIT" +depends="" +makedepends="cmake make gettext-tiny-dev" +subpackages="$pkgname-lang" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname" + +build() { + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + make +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="f65381b6eec64e69e649dacd3a3f75e74d9236164a1277bd2493afb3cb469049bee026d590a7207413b4d92675f877d1d8d3b16c58840a6e15a81638a2f731f2 musl-locales-0.20190626.tar.gz" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 5c9e06bd5..079af13e3 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.2 +pkgver=4.3 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -44,4 +44,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="280c986ebbc83875270da659232910568bcade962b75ddf9ddc2af6e0fb9aab2b0d029a80d632b5c67fc385958ef4d724aafeeb10299c9e2bc281e737a11845c nano-4.2.tar.xz" +sha512sums="3b16b70bdd98ea92cef99dfe5ee859e198bdb1dfa44e25aa200362958f77f8127c7c66aaf204637b768f10b3ea6f45f41417359b2f2608fab28ee9041057bf4f nano-4.3.tar.xz" diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 996168875..91bdf258a 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=10.8 +pkgver=10.9 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -55,6 +55,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2 # 10.8-r0: # - CVE-2018-16850 # - CVE-2019-10130 +# 10.9-r0: +# - CVE-2019-10164 prepare() { default_prepare @@ -252,7 +254,7 @@ _submv() { done } -sha512sums="c9cd0298f553e13e32d4315e17e9e61c1fd011391c5203282d9040f26fd08c85f749e6f2cea3bcc42d1ca153a1272bcd773196ef3bf2bdfb74cd12c5f523b7ca postgresql-10.8.tar.bz2 +sha512sums="4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e postgresql-10.9.tar.bz2 1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index af46fd009..78a480016 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.7.1 -_tstver=1.8.0 +pkgver=3.8.0 +_tstver=1.8.1 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" url="https://github.com/google/protobuf" @@ -116,5 +116,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f protobuf-3.7.1.tar.gz -1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d googletest-1.8.0.tar.gz" +sha512sums="ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 protobuf-3.8.0.tar.gz +e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 34deeb73d..e6f3cc048 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=0 pkgdesc="RSpec runner and formatters" -url="https://relishapp.com/rspec/rspec-core/" +url="https://relishapp.com/rspec/rspec-core" arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6 ruby-rspec-core-3.8.0.tar.gz +sha512sums="fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941 ruby-rspec-core-3.8.1.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index 1cf7cf5cc..ab3808053 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="328b3403e7ac2864ed6ad1a196ca24df6693797e35525559f2082c7e1c161d60da7776ca1a68a82364a7ea55115ac2c12ebf6af8486ef88757a4818a9683ae80 ruby-rspec-expectations-3.8.3.tar.gz +sha512sums="0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8 ruby-rspec-expectations-3.8.4.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index 70a6b801c..314915d92 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba ruby-rspec-mocks-3.8.0.tar.gz +sha512sums="ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8 ruby-rspec-mocks-3.8.1.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index ba2389e72..12c754fc0 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=0 pkgdesc="Support utilities for RSpec gems" -url="https://relishapp.com/rspec/rspec-support/" +url="https://rubygems.org/gems/rspec-support" arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693 ruby-rspec-support-3.8.0.tar.gz +sha512sums="9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc ruby-rspec-support-3.8.2.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/tcsh/002-test_123-posix_fix.patch b/user/tcsh/002-test_123-posix_fix.patch deleted file mode 100644 index 6ed59de38..000000000 --- a/user/tcsh/002-test_123-posix_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Dan Theisen <djt@hxx.in> -Date: Wed Jun 06 03:30:25 2018 -0800 - -The following lines have a subtle change around [:blank:], changing it -to [[:blank:]] instead. This is required because POSIX treats characters -inside of brackets as a group of characters to match against. In this case, -[[:space:]] means [] group of characters, and [:space:] is the group, as per: -IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008), Chapter 9 -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html - ---- tcsh-6.20.00/tests/lexical.at.old 2018-06-06 02:20:16.787145186 -0700 -+++ tcsh-6.20.00/tests/lexical.at 2018-06-06 02:21:09.537890842 -0700 -@@ -567,10 +567,10 @@ - ]]) - AT_DATA([uniformity_test.csh], - [[ --set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` -+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` - echo -n "$SERVICE_NAME_LOG" > ./output1 - --cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 -+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 - - diff -uprN ./output1 ./output2 >& /dev/null - -@@ -587,7 +587,7 @@ - echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result - - set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))" --set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` -+set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` - - echo "$SERVICE_NAME_LOG" > ./actual_result - diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD index 2fdfac0b2..ee876adff 100644 --- a/user/tcsh/APKBUILD +++ b/user/tcsh/APKBUILD @@ -1,10 +1,12 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcsh -pkgver=6.20.00 -pkgrel=2 +pkgver=6.21.00 +_pkgver=${pkgver%.*.*}_${pkgver#*.} +_pkgver=${_pkgver%.*}_${_pkgver#*.} +pkgrel=0 pkgdesc="extended C-shell" -url="http://www.tcsh.org" +url="https://www.tcsh.org" arch="all" license="BSD-3-Clause" depends="" @@ -13,10 +15,10 @@ makedepends="ncurses-dev ncurses-terminfo utmps-dev gettext-tiny-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-doc" options="!checkroot" -source="$pkgname-$pkgver.tar.gz::http://http.debian.net/debian/pool/main/t/tcsh/${pkgname}_${pkgver}.orig.tar.gz - 001-sysmalloc.patch - 002-test_123-posix_fix.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/tcsh-org/tcsh/archive/TCSH${_pkgver}.tar.gz + 001-sysmalloc.patch" +builddir="$srcdir/${pkgname}-TCSH${_pkgver}" build() { cd "$builddir" LIBS="-lutmps -lskarnet -ltinfo" ./configure \ @@ -42,6 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9 tcsh-6.20.00.tar.gz -40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch -b4c1afe04554d117b1402608bcdb243148c0c7b2442bdc10dde3ed6601db5e7c5a2341373f9bdc31fda8860e47a6e152cdcc4e3a8b273742037eebc624df282c 002-test_123-posix_fix.patch" +sha512sums="305380fd065ca4703ffba002358b41727056481573a78301cb8c2390d5fe1a4107af5d482db5abf26f0ce9f7193c8aeb0e34fedcc40971499be2e6dc13bf3405 tcsh-6.21.00.tar.gz +40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index d7a2f6888..3aca3d46d 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2019.04.17 +pkgver=2019.06.21 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -63,4 +63,4 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148 youtube-dl-2019.04.17.tar.gz" +sha512sums="b116f1b636b616e7bd2f5f3d8bbec3b9acebc956f2864391392cfa8bd2af91faa97603d528a13abb6e69ac861582d296870579469e4c6f4f4816dc674e0c27bb youtube-dl-2019.06.21.tar.gz" |