diff options
Diffstat (limited to 'system')
91 files changed, 1014 insertions, 1198 deletions
diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD index 682f2e93c..f5defac52 100644 --- a/system/binutils/APKBUILD +++ b/system/binutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=binutils pkgver=2.32 -pkgrel=4 +pkgrel=5 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" depends="" @@ -32,6 +32,8 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz CVE-2019-12972.patch CVE-2019-14250.patch CVE-2019-14444.patch + CVE-2019-17450.patch + CVE-2019-17451.patch BTS-170.patch BTS-196.patch " @@ -63,6 +65,9 @@ fi # - CVE-2019-14250 # 2.32-r3: # - CVE-2019-14444 +# 2.32-r5: +# - CVE-2019-17450 +# - CVE-2019-17451 build() { local _sysroot=/ @@ -158,5 +163,7 @@ c0f50f1a843480f29b3895c8814df9801b9f90260edbaff1831aa5738fedd07a9e6b7a79f5b6f9be 9109a6ff9c55f310f86a1561fe6b404534928d402672490059bbe358f77c0c2a7f73c8b67f0a4450f00ba1776452858b63fa60cf2ec0744104a6b077e8fa3e42 CVE-2019-12972.patch c277202272d9883741c2530a94c6d50d55dd9d0a9efaa43a1f8c9fc7529bd45e635255c0d90035dfc5920d5387010a4259612a4d711260a95d7b3d9fa6500e4f CVE-2019-14250.patch 0942cc1a4c5ec03e931c6ebd15c5d60eae6be48cd0a3d9b7f6356f97361226bb6d53dbdcb01b20efcca0ccaf23764730d9bbad2c1bbe2ea6ca320e43b43b311b CVE-2019-14444.patch +4e8cbe3985ca4a7cb8954e4e03f094687985b3afec6bb14f1599665e0ab13e601b68cefdbb63e88f9dd59852036dcfee05af14014493c16c76dc38d406efc8fd CVE-2019-17450.patch +a71a035db5e14f105b5d58ec01ad250447f6282cae04e8c931fbdbf7adf118a065c6c9be9c72a204e0f8115b19598dc52f3953ae91200d48328b58cc274939d8 CVE-2019-17451.patch d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110 BTS-170.patch 9cc17d9fe3fc1351d1f6b4fc1c916254529f3304c95db6f4698b867eeb623210b914dc798fb837eafbad2b287b78b31c4ed5482b3151a2992864da04e1dd5fac BTS-196.patch" diff --git a/system/binutils/CVE-2019-17450.patch b/system/binutils/CVE-2019-17450.patch new file mode 100644 index 000000000..edc0e94df --- /dev/null +++ b/system/binutils/CVE-2019-17450.patch @@ -0,0 +1,87 @@ +From 063c511bd79281f33fd33f0964541a73511b9e2b Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Wed, 9 Oct 2019 00:07:29 +1030 +Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance + + PR 25078 + * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add + recur_count. Error on recur_count reaching 100 rather than + info_ptr matching orig_info_ptr. Adjust calls. + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index 575b082..d39f4fd 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decode_line_info (struct comp_unit *, + struct dwarf2_debug *); + + static bfd_boolean +-find_abstract_instance (struct comp_unit * unit, +- bfd_byte * orig_info_ptr, +- struct attribute * attr_ptr, +- const char ** pname, +- bfd_boolean * is_linkage, +- char ** filename_ptr, +- int * linenumber_ptr) ++find_abstract_instance (struct comp_unit *unit, ++ struct attribute *attr_ptr, ++ unsigned int recur_count, ++ const char **pname, ++ bfd_boolean *is_linkage, ++ char **filename_ptr, ++ int *linenumber_ptr) + { + bfd *abfd = unit->abfd; + bfd_byte *info_ptr; +@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit * unit, + struct attribute attr; + const char *name = NULL; + ++ if (recur_count == 100) ++ { ++ _bfd_error_handler ++ (_("DWARF error: abstract instance recursion detected")); ++ bfd_set_error (bfd_error_bad_value); ++ return FALSE; ++ } ++ + /* DW_FORM_ref_addr can reference an entry in a different CU. It + is an offset from the .debug_info section, not the current CU. */ + if (attr_ptr->form == DW_FORM_ref_addr) +@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit * unit, + info_ptr, info_ptr_end); + if (info_ptr == NULL) + break; +- /* It doesn't ever make sense for DW_AT_specification to +- refer to the same DIE. Stop simple recursion. */ +- if (info_ptr == orig_info_ptr) +- { +- _bfd_error_handler +- (_("DWARF error: abstract instance recursion detected")); +- bfd_set_error (bfd_error_bad_value); +- return FALSE; +- } + switch (attr.name) + { + case DW_AT_name: +@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit * unit, + } + break; + case DW_AT_specification: +- if (!find_abstract_instance (unit, info_ptr, &attr, ++ if (!find_abstract_instance (unit, &attr, recur_count + 1, + &name, is_linkage, + filename_ptr, linenumber_ptr)) + return FALSE; +@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit *unit) + + case DW_AT_abstract_origin: + case DW_AT_specification: +- if (!find_abstract_instance (unit, info_ptr, &attr, ++ if (!find_abstract_instance (unit, &attr, 0, + &func->name, + &func->is_linkage, + &func->file, +-- +2.9.3 + diff --git a/system/binutils/CVE-2019-17451.patch b/system/binutils/CVE-2019-17451.patch new file mode 100644 index 000000000..f6af71601 --- /dev/null +++ b/system/binutils/CVE-2019-17451.patch @@ -0,0 +1,38 @@ +From 336bfbeb1848f4b9558456fdcf283ee8a32d7fd1 Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Wed, 9 Oct 2019 10:47:13 +1030 +Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line + +Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 +and ffffd5555453b140 result in a total size of 1. Reading the first +section of course overflows the buffer and tramples on other memory. + + PR 25070 + * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of + total_size calculation. + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index d39f4fd..88aaa2d 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, + for (total_size = 0; + msec; + msec = find_debug_info (debug_bfd, debug_sections, msec)) +- total_size += msec->size; ++ { ++ /* Catch PR25070 testcase overflowing size calculation here. */ ++ if (total_size + msec->size < total_size ++ || total_size + msec->size < msec->size) ++ { ++ bfd_set_error (bfd_error_no_memory); ++ return FALSE; ++ } ++ total_size += msec->size; ++ } + + stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); + if (stash->info_ptr_memory == NULL) +-- +2.9.3 + diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index dfdd3ae61..a95050c83 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=cryptsetup -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=0 pkgdesc="Setup tool for block device encryption" url="https://gitlab.com/cryptsetup/cryptsetup" @@ -56,6 +56,6 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="f5e2d733b1897f85aec0bd940efd9fb4f20e3628c39f1c00b3a9707ce4c0d9f4192e67dab0588a889ba148874c52bbb410634349490ff8ea7b779c5f8bd7bdd8 cryptsetup-2.2.0.tar.gz +sha512sums="697d77e756a3eeb8138f974a2259d4f7b9cd32c6d5569b0b04866747abb2a48ae5ed914a044ec8513bc66bbe0a9d10a439cb55f22c7c147b52561c870e964e65 cryptsetup-2.2.1.tar.gz 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd 81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd" diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 50f12a741..a54884ba9 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour=-power8-64k _pkgname=easy-kernel$_kflavour -pkgver=4.14.138 -pkgrel=15 +pkgver=4.14.149 +pkgrel=16 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" url="https://kernel.org/" @@ -88,6 +88,6 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -f81ad5ed82bc1141b97be22c3767d3c1984bed50ff847f3596609bdece05a70ba8e73fb7d5aa3163898b7e77c8b5eb4d8be4f2e9f84f17579f8b70c96f465317 linux-4.14-mc15-patches.tar.xz +c38d64091dfd9bbf326d345c1b488d90a36b8a6c18882d62883c1dc39d4c5394f254b09813252bad57e6ddbbee80c1de90374257bd96ba50fee0241ed53c6bc2 linux-4.14-mc16-patches.tar.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -b4f8d49567243ea97731d031b1850d8b764177597c14a4ec56af0235c1cc5d69a336985db89fc941ea3b9c8ba3eac7ef63f4c7370a945f7b8fab3ba0c0f140aa config-ppc64" +d77c6ace3efa5d23fc193e263a939708e36fe836d141cd78fef01f04ee2d975387c7a62a309209226240dcb3b361cc6c7676634b56b7e5db9a79bcfec127df01 config-ppc64" diff --git a/system/easy-kernel-power8-64k/config-ppc64 b/system/easy-kernel-power8-64k/config-ppc64 index 95e3262b3..59b6b5664 100644 --- a/system/easy-kernel-power8-64k/config-ppc64 +++ b/system/easy-kernel-power8-64k/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.138-mc15 Kernel Configuration +# Linux/powerpc 4.14.149-mc16 Kernel Configuration # CONFIG_PPC64=y @@ -3261,7 +3261,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 3afc9b44e..aa55360c8 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour=-power8 _pkgname=easy-kernel$_kflavour -pkgver=4.14.138 -pkgrel=15 +pkgver=4.14.149 +pkgrel=16 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers" url="https://kernel.org/" @@ -88,6 +88,6 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -f81ad5ed82bc1141b97be22c3767d3c1984bed50ff847f3596609bdece05a70ba8e73fb7d5aa3163898b7e77c8b5eb4d8be4f2e9f84f17579f8b70c96f465317 linux-4.14-mc15-patches.tar.xz +c38d64091dfd9bbf326d345c1b488d90a36b8a6c18882d62883c1dc39d4c5394f254b09813252bad57e6ddbbee80c1de90374257bd96ba50fee0241ed53c6bc2 linux-4.14-mc16-patches.tar.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -dca57ab8f44951fe3ce2c5b0ed33680e51063ead66d1c6a201244231b57b7a780db06285bf59e8afe8b855479a57c9990abf9c7c649c0a73ef8f4c3e6f9cb10d config-ppc64" +e40c359ee8d7cdfb74a3a2ec93894496fef2d0470ec7d944eb1060a8c11b6689ec4b4327ea3c211bcdfd31417fdec55fe2f1ece9c0fcfbf4bed0ce6ed7455636 config-ppc64" diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64 index e577edb15..8d2f779fc 100644 --- a/system/easy-kernel-power8/config-ppc64 +++ b/system/easy-kernel-power8/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.138-mc15 Kernel Configuration +# Linux/powerpc 4.14.149-mc16 Kernel Configuration # CONFIG_PPC64=y @@ -3260,7 +3260,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index d6eeb5c47..57ccd4e8c 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour="" _pkgname=easy-kernel$_kflavour -pkgver=4.14.138 -pkgrel=15 +pkgver=4.14.149 +pkgrel=16 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -102,6 +102,21 @@ builddir="$srcdir/linux-${_pkgminver}" # - CVE-2019-13648 # - CVE-2019-14283 # - CVE-2019-14284 +# 4.14.149-mc16: +# - CVE-2019-14814 +# - CVE-2019-14815 +# - CVE-2019-14816 +# - CVE-2019-14821 +# - CVE-2019-14835 +# - CVE-2019-15030 +# - CVE-2019-15117 +# - CVE-2019-15118 +# - CVE-2019-15505 +# - CVE-2019-15538 +# - CVE-2019-16746 +# - CVE-2019-17054 +# - CVE-2019-17055 +# - CVE-2019-17056 prepare() { for patch in "$srcdir/linux-${_pkgminver}-mc$pkgrel-patches"/*; do @@ -198,13 +213,13 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -f81ad5ed82bc1141b97be22c3767d3c1984bed50ff847f3596609bdece05a70ba8e73fb7d5aa3163898b7e77c8b5eb4d8be4f2e9f84f17579f8b70c96f465317 linux-4.14-mc15-patches.tar.xz +c38d64091dfd9bbf326d345c1b488d90a36b8a6c18882d62883c1dc39d4c5394f254b09813252bad57e6ddbbee80c1de90374257bd96ba50fee0241ed53c6bc2 linux-4.14-mc16-patches.tar.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -169bfc8cf7463e22e67477907ba2f02593178db8a04d1d0f4f52d834087cbd3d504328960849e90532e95d16dc7f29fdbcc55d231696dcd6dbb0df4b0a337ce6 config-ppc64 -d939115ee69713efd4ac47fa75e30536fbefe90dcfdfcba38ec31ed97afe53a4cdacb4750946bf2841ddd5d8d1fa34ec2c6c0207a9efef5110a23cae67ff34c8 config-ppc -dbda29dd1dba54713d27e73e25b67fcd54ca9af1e18b50fd174628dccf15af7a8a604bf795d8da381f9c299889ce5cfb8fd3cefddf7cbbbaad78fb028c04facb config-x86_64 -85aef081cefb13ab319e5fbccc47b90a439dbb7be00895681569420339dc34c55e42278c471ca15144e84e6fc8a57a3a0899c2caee7e00dab9e369a5dea90e3b config-pmmx -378120b61b6809a44a5bde9049b2f90345df8fe93caf2091887a5278bcd7bf002ba57565b73ec618e6029543f251d12136ef5094b594a78be652a2273ecc31b3 config-aarch64 -93456f06225ac67edd697dfa46e4ec38293e8da4dd67fe6cd3f4a7f961956fe35e27d506ef3481f2a49ad73f2b736a88b37ceaa17e9e8c94f99346268bc1ea9d config-sparc64 -9be2ec1b09cf233c4259fb1dd1a9afa89b873ebc51bea9f15443180cba1968a905c6333cb2ed5a7976120a67e1b9848cd0aaaf7596a88f2c388328c48a487134 config-m68k +2299b107b0b9fe503095e0dbdd4edd4134c05fc4a86e650805781aaa508f18a2e4eda59341355f62a0fdc7b301b4876f452c3109c042cbb218f23e0d314a4ff9 config-ppc64 +e35c70c7ac02a2894a3c4197070b9afa3315c403bf5e178ce251e63bf21609525871c55cbad4fd449af63104be68c7625ea1e1383c077d0bbc0f1960c2b6c4a9 config-ppc +27deb4d449853eb725501b5f69eb8d4169d4fac951b33dc184ade8df1f8fe72f192fa4c4d0d34cd98cf6ef40da3bedbed6f87268fa6a05c0a348d3b727e4d766 config-x86_64 +9e089209e69c7bb7ca16d425d7e76d7160622288299247ee544f93337b21fb4aec3e2cd594703eb877155cfb9d82dedf1f3945055cdb2b9369e73c7c9fd21e8d config-pmmx +13137f8706b176b395b30154a97903ba3f7bf3b0a3ff241e8c2f67e1a0fb92ad34609ba1d3f6ab262a5032bc9dbff45bbc749f0ad9dc2aa008c9bbac0c0247ef config-aarch64 +dd7a6bb6fe26426e758fa85e57377d93a8fba4fe77dc67fc5ac0feb98316b9782971b9b4ef17a0fa8c158ea9ae348a6b93dc6dc0be8d28130aa7fbe4a68fb752 config-sparc64 +e6000e88d97144907c1f5c424d52a8b95f2eac82a707bef97c39c2b1658b08b9765451a0297bcc6a297ab9f0a3ab993d59f977009325066e2512aa1a820acc88 config-m68k fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index aa612331e..6100f653d 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.138-mc15 Kernel Configuration +# Linux/arm64 4.14.149-mc16 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -3890,7 +3890,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set @@ -5754,6 +5754,7 @@ CONFIG_ARM_PSCI_FW=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM_SCPI_POWER_DOMAIN=y # CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_ISCSI_IBFT is not set CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_QCOM_SCM=y diff --git a/system/easy-kernel/config-m68k b/system/easy-kernel/config-m68k index 114964aff..4b80d1d40 100644 --- a/system/easy-kernel/config-m68k +++ b/system/easy-kernel/config-m68k @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/m68k 4.14.138-mc15 Kernel Configuration +# Linux/m68k 4.14.149-mc16 Kernel Configuration # CONFIG_M68K=y CONFIG_CPU_BIG_ENDIAN=y @@ -1742,7 +1742,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 61164a973..f841477ea 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.138-mc15 Kernel Configuration +# Linux/x86 4.14.149-mc16 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4527,7 +4527,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y @@ -5478,7 +5478,7 @@ CONFIG_OF_IOMMU=y CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_SVM is not set -CONFIG_INTEL_IOMMU_DEFAULT_ON=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y # @@ -5602,7 +5602,7 @@ CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set +# CONFIG_ISCSI_IBFT is not set CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_GOOGLE_FIRMWARE is not set diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc index 9c5b61db1..37070dbe9 100644 --- a/system/easy-kernel/config-ppc +++ b/system/easy-kernel/config-ppc @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.138-mc15 Kernel Configuration +# Linux/powerpc 4.14.149-mc16 Kernel Configuration # # CONFIG_PPC64 is not set @@ -3645,7 +3645,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y # CONFIG_LOGO_LINUX_VGA16 is not set diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64 index 49e0bae8d..7bb1a1880 100644 --- a/system/easy-kernel/config-ppc64 +++ b/system/easy-kernel/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.138-mc15 Kernel Configuration +# Linux/powerpc 4.14.149-mc16 Kernel Configuration # CONFIG_PPC64=y @@ -3428,7 +3428,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_FB_LOGO_EXTRA=y CONFIG_LOGO_LINUX_MONO=y diff --git a/system/easy-kernel/config-sparc64 b/system/easy-kernel/config-sparc64 index e9bcdaf44..8364d2e4a 100644 --- a/system/easy-kernel/config-sparc64 +++ b/system/easy-kernel/config-sparc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/sparc 4.14.138-mc15 Kernel Configuration +# Linux/sparc 4.14.149-mc16 Kernel Configuration # CONFIG_64BIT=y CONFIG_SPARC=y @@ -2812,7 +2812,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index 4c2a419c2..5a5a1a94a 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.14.138-mc15 Kernel Configuration +# Linux/x86 4.14.149-mc16 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4646,7 +4646,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y @@ -5675,7 +5675,7 @@ CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y @@ -5802,7 +5802,7 @@ CONFIG_DCDBAS=m CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index b0b3bc585..146fff618 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=fakeroot -pkgver=1.23 +pkgver=1.24 pkgrel=0 pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user" arch="all" @@ -12,7 +12,7 @@ makedepends_host="libcap-dev acl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" checkdepends="bash sharutils" subpackages="$pkgname-doc" -source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.xz +source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz fakeroot-hide-dlsym-errors.patch fakeroot-no64.patch fakeroot-stdint.patch @@ -45,7 +45,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 fakeroot_1.23.orig.tar.xz +sha512sums="b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 fakeroot_1.24.orig.tar.gz 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD index 05a9d955a..c789cd3a0 100644 --- a/system/findutils/APKBUILD +++ b/system/findutils/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=findutils -pkgver=4.6.0 -pkgrel=2 +pkgver=4.7.0 +pkgrel=0 pkgdesc="GNU utilities for finding files" url="https://www.gnu.org/software/findutils/" arch="all" @@ -12,10 +12,10 @@ depends="" makedepends="" checkdepends="coreutils diffutils dejagnu" subpackages="$pkgname-doc $pkgname-lang" -source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz - localename-test-fix.patch +source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch sysmacros.patch + gnulib-test-datetime.patch " build() { @@ -39,7 +39,7 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4 findutils-4.6.0.tar.gz -39fc0bc7602dd5300cf0b5488a7d14b6d00e05fedd6067ff45a229e65ff020d0003c0bb8e43807d9874afeb39c1dae6d612182caeb7de76156e1bc6ceb50adfc localename-test-fix.patch -96351821572bee9e23760568b5a9f326c8727b6904a8b9f6fc8e5b8e14b42265c632cea09a913db830844f3015f91a03b9c4dd72862f40a3c3814556497434e2 gnulib-tests-dont-require-gpg-passphrase.patch -2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch" +sha512sums="650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e findutils-4.7.0.tar.xz +dc7e9c4fdd36d05ca230e3456a8005a5fcd353db07181e0d17ab66db4eb967e6bdfe3b6f1da0edbb38e973fea89ae174ea31e6839f59d3084b15f08de363f139 gnulib-tests-dont-require-gpg-passphrase.patch +2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch +8e367ba108b66ea27b2a289e51acbdf540d7e7ab5dfb8347a007eaf763355707db43c44e530fbec40f47578405880ff99d34eec97570365f2ab3439c4f1bf358 gnulib-test-datetime.patch" diff --git a/system/findutils/gnulib-test-datetime.patch b/system/findutils/gnulib-test-datetime.patch new file mode 100644 index 000000000..2b227fc27 --- /dev/null +++ b/system/findutils/gnulib-test-datetime.patch @@ -0,0 +1,24 @@ +--- coreutils-8.31/gnulib-tests/test-parse-datetime.c.old 2019-06-01 07:46:25.716292871 +0000 ++++ coreutils-8.31/gnulib-tests/test-parse-datetime.c 2019-06-01 22:07:59.456653669 +0000 +@@ -432,21 +432,5 @@ + ASSERT ( parse_datetime (&result, "TZ=\"\\\\\"", &now)); + ASSERT ( parse_datetime (&result, "TZ=\"\\\"\"", &now)); + +- /* Outlandishly-long time zone abbreviations should not cause problems. */ +- { +- static char const bufprefix[] = "TZ=\""; +- enum { tzname_len = 2000 }; +- static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789"; +- enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix }; +- char buf[bufsize]; +- memcpy (buf, bufprefix, sizeof bufprefix - 1); +- memset (buf + sizeof bufprefix - 1, 'X', tzname_len); +- strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix); +- ASSERT (parse_datetime (&result, buf, &now)); +- LOG (buf, now, result); +- ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3 +- && result.tv_nsec == 123456789); +- } +- + return 0; + } diff --git a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch index 755126f64..46b921ff9 100644 --- a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch +++ b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch @@ -1,5 +1,5 @@ ---- findutils-4.6.0/tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 -+++ findutils-4.6.0/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 +--- findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 ++++ findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 @@ -32,6 +32,7 @@ touch d/a b c && git config user.email "you@example.com" && diff --git a/system/findutils/localename-test-fix.patch b/system/findutils/localename-test-fix.patch deleted file mode 100644 index 666261f03..000000000 --- a/system/findutils/localename-test-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- findutils-4.6.0/tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 -+++ findutils-4.6.0/tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -40,7 +40,7 @@ - # if defined __APPLE__ && defined __MACH__ - # include <xlocale.h> - # endif --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined __linux__ - # include <langinfo.h> - # endif - # if !defined IN_LIBINTL -@@ -2692,16 +2692,19 @@ - locale_t thread_locale = uselocale (NULL); - if (thread_locale != LC_GLOBAL_LOCALE) - { --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined(_NL_LOCALE_NAME) -+ const char *name = nl_langinfo(_NL_LOCALE_NAME(category)); -+# if __GLIBC__ >= 2 && !defined __UCLIBC__ - /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in - glibc < 2.12. - See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */ -- const char *name = -- nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); -+ if (name[0] == '\0') -+ name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); - if (name[0] == '\0') - /* Fallback code for glibc < 2.4, which did not implement - nl_langinfo (_NL_LOCALE_NAME (category)). */ - name = thread_locale->__names[category]; -+# endif - return name; - # elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__) - /* FreeBSD, Mac OS X */ diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index 401fa2cf0..010c6834d 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libssh2 pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="Library for accessing SSH servers" url="https://libssh2.org/" arch="all" @@ -11,7 +11,12 @@ checkdepends="openssh-server" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz - test-sshd.patch" + test-sshd.patch + CVE-2019-17498.patch" + +# secfixes: +# 1.9.0-r1: +# - CVE-2019-17498 build() { ./configure \ @@ -35,4 +40,5 @@ package() { } sha512sums="41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17 libssh2-1.9.0.tar.gz -eef3c43184d53a3c655915ad61d182a88d9cced75ba8f8dde73ccf771ff4aeaa0f26e95aeb53601d7c47d96a2421c98678e9baf497f3883faa4427a091eea62c test-sshd.patch" +eef3c43184d53a3c655915ad61d182a88d9cced75ba8f8dde73ccf771ff4aeaa0f26e95aeb53601d7c47d96a2421c98678e9baf497f3883faa4427a091eea62c test-sshd.patch +102542a2023d53f7684c99a89fa4c592ee4ababc09bc174c52cd20f7f21b4c5878a89bae7e20c3438490666b7b0758caba5cf82c2b2965e1e58e02d5c1f4ea47 CVE-2019-17498.patch" diff --git a/system/libssh2/CVE-2019-17498.patch b/system/libssh2/CVE-2019-17498.patch new file mode 100644 index 000000000..a908c9974 --- /dev/null +++ b/system/libssh2/CVE-2019-17498.patch @@ -0,0 +1,210 @@ +From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Thu, 29 Aug 2019 15:14:19 -0700 +Subject: [PATCH 1/5] packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST +--- + src/packet.c | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab6294..ac69768c 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + case SSH_MSG_DEBUG: + if(datalen >= 2) { + int always_display = data[1]; +- ++ + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, + +From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Thu, 29 Aug 2019 15:15:33 -0700 +Subject: [PATCH 2/5] stray whitespace + +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index ac69768c..8908b2c5 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + case SSH_MSG_DEBUG: + if(datalen >= 2) { + int always_display = data[1]; +- ++ + if(datalen >= 6) { + struct string_buf buf; + buf.data = (unsigned char *)data; + +From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Thu, 29 Aug 2019 15:24:22 -0700 +Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT + +SSH_MSG_DISCONNECT now also uses _libssh2_get API. +--- + src/packet.c | 40 +++++++++++++++------------------------- + 1 file changed, 15 insertions(+), 25 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 8908b2c5..97f0cdd4 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); + +From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Thu, 29 Aug 2019 15:26:32 -0700 +Subject: [PATCH 4/5] fixed stray ( + +bad paste +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index 97f0cdd4..bd4c39e4 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { ++ if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, + +From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Thu, 29 Aug 2019 15:29:00 -0700 +Subject: [PATCH 5/5] added additional parentheses for clarity + +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index bd4c39e4..2e01bfc5 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index b21a0be09..d41559e46 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd pkgver=0.1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -20,15 +20,11 @@ build() { } package() { - svcdir="$pkgdir/etc/s6-linux-init/current/run-image/service/mdevd" cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p -m 0755 "$svcdir" + mkdir -p -m 0755 "$pkgdir/etc" cp -f "$srcdir/mdev.conf" "$pkgdir/etc/" chmod 0644 "$pkgdir/etc/mdev.conf" - cp -f "$srcdir/mdevd.run" "$svcdir/run" - echo 3 > "$svcdir/notification-fd" - touch "$svcdir/down" } @@ -43,10 +39,14 @@ doc() { openrc() { rldir="$subpkgdir"/etc/runlevels/sysinit + svcdir="$subpkgdir/etc/s6-linux-init/current/run-image/service/mdevd" default_openrc - mkdir -p "$rldir" + mkdir -p "$rldir" "$svcdir" + cp -f "$srcdir/mdevd.run" "$svcdir/run" + chmod 0755 "$svcdir/run" + echo 3 > "$svcdir/notification-fd" + touch "$svcdir/down" ln -s ../../init.d/mdevd "$rldir/mdevd" - ln -s ../../init.d/mdevd-coldplug "$rldir/mdevd-coldplug" } sha512sums="94bbcaf0c39511da392c932c5d38ced7029727a46997877d03bba41fc7302df3d4400d3957be9361055e954f3a22b785db40d56bb2f031bc49bb2f398179efe0 mdevd-0.1.1.0.tar.gz diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD index da56a73f9..63356d7b6 100644 --- a/system/parted/APKBUILD +++ b/system/parted/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=parted pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="https://www.gnu.org/software/parted/parted.html" arch="all" @@ -32,7 +32,7 @@ build() { --host=$CHOST \ --prefix=/usr \ --disable-debug \ - --disable-static \ + --enable-static \ --enable-shared \ --enable-device-mapper \ --without-readline diff --git a/system/perl-authen-sasl/APKBUILD b/system/perl-authen-sasl/APKBUILD index b894d9dee..74afc7ab0 100644 --- a/system/perl-authen-sasl/APKBUILD +++ b/system/perl-authen-sasl/APKBUILD @@ -1,6 +1,9 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-authen-sasl -_realname=Authen-SASL +_pkgreal=Authen-SASL +_author=GBARR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=2.16 pkgrel=2 pkgdesc="SASL authentication framework for Perl" @@ -8,28 +11,22 @@ url="https://metacpan.org/release/Authen-SASL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-digest-hmac" -makedepends="perl-dev perl-module-install" -install= +makedepends="perl-module-install" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Authen-SASL-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/Authen-SASL-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index ef5094438..8e8ac6a9f 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,39 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS +_author=RURBAN +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=4.12 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="perl-json perl-test-leaktrace" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-dev perl-json perl-test-leaktrace" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index 50bfdaa64..02a69c21c 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbd-sqlite -_pkgname=DBD-SQLite +_pkgreal=DBD-SQLite +_author=ISHIGAKI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.64 pkgrel=0 pkgdesc="Perl DBI SQLite module" @@ -9,12 +12,12 @@ url="https://metacpan.org/release/DBD-SQLite" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-dbi" -makedepends="perl perl-dev sqlite-dev" -source="https://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/${_pkgname}-$pkgver.tar.gz +makedepends="perl-dev sqlite-dev" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz perl-DBD-SQLite-bz543982.patch " subpackages="$pkgname-dev $pkgname-doc" -builddir="$srcdir"/${_pkgname}-$pkgver +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') diff --git a/system/perl-dbi/APKBUILD b/system/perl-dbi/APKBUILD index 39f2718f5..fb38ba60a 100644 --- a/system/perl-dbi/APKBUILD +++ b/system/perl-dbi/APKBUILD @@ -1,32 +1,32 @@ # Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbi -_realpkgname=DBI +_pkgreal=DBI +_author=TIMB +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.642 pkgrel=0 pkgdesc="Database independent interface for Perl" url="https://metacpan.org/release/DBI" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends= -makedepends="perl perl-dev" +depends="perl" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://www.cpan.org/authors/id/T/TI/TIMB/${_realpkgname}-$pkgver.tar.gz" -builddir="$srcdir"/${_realpkgname}-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check () { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete diff --git a/system/perl-digest-hmac/APKBUILD b/system/perl-digest-hmac/APKBUILD index 411445654..7c76618d8 100644 --- a/system/perl-digest-hmac/APKBUILD +++ b/system/perl-digest-hmac/APKBUILD @@ -1,32 +1,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-digest-hmac -_realname=Digest-HMAC +_pkgreal=Digest-HMAC +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.03 pkgrel=1 pkgdesc="Keyed-Hashing for Message Authentication Perl module" url="https://metacpan.org/release/Digest-HMAC" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-digest-sha1" -makedepends="perl-dev" -install= +depends="perl-digest-sha1" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz" -builddir="$srcdir"/$_realname-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete diff --git a/system/perl-digest-sha1/APKBUILD b/system/perl-digest-sha1/APKBUILD index 9d4155ce1..99c8f59a7 100644 --- a/system/perl-digest-sha1/APKBUILD +++ b/system/perl-digest-sha1/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-digest-sha1 -_realname=Digest-SHA1 +_pkgreal=Digest-SHA1 +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=2.13 pkgrel=11 pkgdesc="Perl interface to the SHA-1 algorithm" @@ -10,32 +13,23 @@ arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" makedepends="perl-dev" -install= subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz perl-digest-sha1-check-object.patch " -builddir="$srcdir/$_realname-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - default_prepare +build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ OPTIMIZE="$CFLAGS" -} - -build() { - cd "$builddir" make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD index 9e174dc10..adb4c21de 100644 --- a/system/perl-encode-eucjpascii/APKBUILD +++ b/system/perl-encode-eucjpascii/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-eucjpascii +_pkgreal=Encode-EUCJPASCII +_author=NEZUMI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.03 pkgrel=0 pkgdesc="Perl mapping of EUC-JP to ASCII" @@ -9,22 +13,19 @@ arch="all" license="Artistic-1.0-Perl AND GPL-2.0+" depends="perl" makedepends="perl-dev" -source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz" -builddir="$srcdir/Encode-EUCJPASCII-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-0.03.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD index dce57db59..f00fb7a15 100644 --- a/system/perl-encode-hanextra/APKBUILD +++ b/system/perl-encode-hanextra/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-hanextra +_pkgreal=Encode-HanExtra +_author=AUDREYT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.23 pkgrel=0 pkgdesc="Perl support for more Chinese encodings" @@ -10,22 +14,19 @@ license="Artistic-1.0-Perl AND GPL-2.0+" depends="perl" makedepends="perl-module-install perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz" -builddir="$srcdir/Encode-HanExtra-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD index 2c0321813..d9e9928a0 100644 --- a/system/perl-encode-iso2022/APKBUILD +++ b/system/perl-encode-iso2022/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-iso2022 +_pkgreal=Encode-ISO2022 +_author=NEZUMI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.04 pkgrel=0 pkgdesc="Perl support for ISO-2022 encodings" @@ -10,22 +14,19 @@ license="Artistic-1.0-Perl AND GPL-2.0+" depends="perl" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-ISO2022-$pkgver.tar.gz" -builddir="$srcdir/Encode-ISO2022-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD index b5fe8f8f3..9d939a39b 100644 --- a/system/perl-encode-jisx0213/APKBUILD +++ b/system/perl-encode-jisx0213/APKBUILD @@ -1,31 +1,32 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-jisx0213 +_pkgreal=Encode-JISX0213 +_author=NEZUMI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.04 pkgrel=0 pkgdesc="Perl support for JIS X 0213 encodings" url="https://metacpan.org/pod/Encode::JISX0213" arch="all" license="Artistic-1.0-Perl AND GPL-2.0+" -depends="perl perl-encode-iso2022" +depends="perl-encode-iso2022" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-JISX0213-$pkgver.tar.gz" -builddir="$srcdir/Encode-JISX0213-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-encode-locale/APKBUILD b/system/perl-encode-locale/APKBUILD index 0bcfd0c88..9830bc079 100644 --- a/system/perl-encode-locale/APKBUILD +++ b/system/perl-encode-locale/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-locale -_realname=Encode-Locale +_pkgreal=Encode-Locale +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.05 pkgrel=2 pkgdesc="Perl module - Determine locale encoding" @@ -9,28 +12,22 @@ url="https://metacpan.org/release/Encode-Locale" arch="noarch" license="GPL-2.0-only Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" -install= +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz" - -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-error/APKBUILD b/system/perl-error/APKBUILD index b859d15eb..f4eb8dee2 100644 --- a/system/perl-error/APKBUILD +++ b/system/perl-error/APKBUILD @@ -1,6 +1,9 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-error _realname=Error +_author=SHLOMIF +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.17028 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" @@ -8,31 +11,21 @@ url="https://metacpan.org/release/Error" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" -install= +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_realname-$pkgver.tar.gz" builddir="$srcdir"/$_realname-$pkgver -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-extutils-config/APKBUILD b/system/perl-extutils-config/APKBUILD index 7c0f1978b..9fe879135 100644 --- a/system/perl-extutils-config/APKBUILD +++ b/system/perl-extutils-config/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-extutils-config _pkgreal=ExtUtils-Config +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.008 pkgrel=0 pkgdesc="A wrapper library for Perl configuration" url="https://metacpan.org/release/ExtUtils-Config" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-extutils-helpers/APKBUILD b/system/perl-extutils-helpers/APKBUILD index 4070b7137..5ee705b17 100644 --- a/system/perl-extutils-helpers/APKBUILD +++ b/system/perl-extutils-helpers/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-extutils-helpers _pkgreal=ExtUtils-Helpers +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.026 pkgrel=0 pkgdesc="Various portability utilities for Perl module builders" url="https://metacpan.org/release/ExtUtils-Helpers" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-extutils-installpaths/APKBUILD b/system/perl-extutils-installpaths/APKBUILD index df8d7dcf0..a76b4ea16 100644 --- a/system/perl-extutils-installpaths/APKBUILD +++ b/system/perl-extutils-installpaths/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-extutils-installpaths _pkgreal=ExtUtils-InstallPaths +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.012 pkgrel=0 pkgdesc="Build.PL install path logic made easy" url="https://metacpan.org/release/ExtUtils-InstallPaths" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-extutils-config" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-extutils-config" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-file-listing/APKBUILD b/system/perl-file-listing/APKBUILD index db9ea786a..2f90ff91f 100644 --- a/system/perl-file-listing/APKBUILD +++ b/system/perl-file-listing/APKBUILD @@ -1,34 +1,32 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-listing +_pkgreal=File-Listing +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.04 pkgrel=2 -pkgdesc="File::Listing perl module" +pkgdesc="Perl module for parsing directory lists in various formats" url="https://metacpan.org/release/File-Listing" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-http-date" -makedepends="perl-dev" -install="" -replaces="perl-libwww" +depends="perl-http-date" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-$pkgver.tar.gz" - -builddir="$srcdir"/File-Listing-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-file-remove/APKBUILD b/system/perl-file-remove/APKBUILD index 43ea8ff9a..d4276fcd9 100644 --- a/system/perl-file-remove/APKBUILD +++ b/system/perl-file-remove/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-remove _pkgreal=File-Remove +_author=SHLOMIF +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.58 pkgrel=0 pkgdesc="Remove files and directories" url="https://metacpan.org/release/File-Remove" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-html-parser/APKBUILD b/system/perl-html-parser/APKBUILD index 227948e5c..1bc2ef26c 100644 --- a/system/perl-html-parser/APKBUILD +++ b/system/perl-html-parser/APKBUILD @@ -3,40 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-html-parser _pkgreal=HTML-Parser +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=3.72 pkgrel=3 pkgdesc="Perl HTML parser" url="https://metacpan.org/release/HTML-Parser" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-html-tagset" -cpanmakedepends=" " -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-html-tagset" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-html-tagset/APKBUILD b/system/perl-html-tagset/APKBUILD index 9fe51281f..15f9525f1 100644 --- a/system/perl-html-tagset/APKBUILD +++ b/system/perl-html-tagset/APKBUILD @@ -3,37 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-html-tagset _pkgreal=HTML-Tagset +_author=PETDANCE +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=3.20 pkgrel=2 pkgdesc="Useful data tables for parsing HTML" url="https://metacpan.org/release/HTML-Tagset" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-http-cookies/APKBUILD b/system/perl-http-cookies/APKBUILD index 5515f1057..986dc5d77 100644 --- a/system/perl-http-cookies/APKBUILD +++ b/system/perl-http-cookies/APKBUILD @@ -2,32 +2,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-cookies _pkgreal=HTTP-Cookies +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.04 pkgrel=1 pkgdesc="Perl HTTP cookie jars" url="https://metacpan.org/release/HTTP-Cookies" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" -depends="perl perl-http-date perl-http-message" -makedepends="perl-dev" -replaces="perl-libwww" +depends="perl-http-date perl-http-message" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-http-daemon/APKBUILD b/system/perl-http-daemon/APKBUILD index a0fc81ce5..aed0d4aae 100644 --- a/system/perl-http-daemon/APKBUILD +++ b/system/perl-http-daemon/APKBUILD @@ -1,25 +1,24 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-daemon +_pkgreal=HTTP-Daemon pkgver=6.06 -_author=O -_author2=${_author}A -_author3=${_author2}LDERS +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgrel=0 pkgdesc="HTTP::Daemon perl module" url="https://metacpan.org/release/HTTP-Daemon" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" -depends="perl perl-http-date perl-http-message" +depends="perl-http-date perl-http-message" checkdepends="perl-test-needs" -makedepends="perl-dev perl-module-build" -replaces="perl-libwww" +makedepends="perl-module-build" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/$_author/$_author2/$_author3/HTTP-Daemon-$pkgver.tar.gz" -builddir="$srcdir"/HTTP-Daemon-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - # use Module::Build for non-/usr/local, not Module::Build::Tiny. PERL_MB_FALLBACK_SILENCE_WARNING=1 perl Build.PL installdirs=vendor ./Build } diff --git a/system/perl-http-date/APKBUILD b/system/perl-http-date/APKBUILD index 4cfb54549..5bf34a0f0 100644 --- a/system/perl-http-date/APKBUILD +++ b/system/perl-http-date/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-date -_realname=HTTP-Date +_pkgreal=HTTP-Date +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.02 pkgrel=2 pkgdesc="Perl module date conversion routines" @@ -9,29 +12,22 @@ url="https://metacpan.org/release/HTTP-Date" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" -replaces="perl-libwww" -install= +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz" - -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD index 0cc720442..39f8523dc 100644 --- a/system/perl-http-message/APKBUILD +++ b/system/perl-http-message/APKBUILD @@ -3,41 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-message _pkgreal=HTTP-Message +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.18 pkgrel=0 pkgdesc="Perl class encapsulating HTTP-style messages" url="https://metacpan.org/release/HTTP-Message" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-lwp-mediatypes perl-encode-locale perl-http-date perl-uri perl-io-html" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-lwp-mediatypes perl-encode-locale perl-http-date perl-uri perl-io-html" +makedepends="" checkdepends="perl-try-tiny" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-http-negotiate/APKBUILD b/system/perl-http-negotiate/APKBUILD index f0cc5d77c..08600fb4c 100644 --- a/system/perl-http-negotiate/APKBUILD +++ b/system/perl-http-negotiate/APKBUILD @@ -1,32 +1,32 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-negotiate +_pkgreal=HTTP-Negotiate +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.01 pkgrel=2 -pkgdesc="HTTP::Negotiate perl module" +pkgdesc="Perl module for negotiating HTTP protocol versions" url="https://metacpan.org/release/HTTP-Negotiate" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-http-message" -makedepends="perl-dev" -install="" +depends="perl-http-message" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz" -builddir="$srcdir"/HTTP-Negotiate-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-io-html/APKBUILD b/system/perl-io-html/APKBUILD index 7d32a8dbd..9d563e046 100644 --- a/system/perl-io-html/APKBUILD +++ b/system/perl-io-html/APKBUILD @@ -2,39 +2,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-io-html _pkgreal=IO-HTML +_author=CJM +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.001 pkgrel=2 pkgdesc="Open an HTML file with automatic charset detection" url="https://metacpan.org/release/IO-HTML" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD index ab1804d91..9324a3973 100644 --- a/system/perl-io-socket-ssl/APKBUILD +++ b/system/perl-io-socket-ssl/APKBUILD @@ -2,6 +2,9 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-io-socket-ssl _pkgreal=IO-Socket-SSL +_author=SULLR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=2.066 pkgrel=0 pkgdesc="Perl module implementing SSL/TLS with IO::Socket interface" @@ -9,30 +12,21 @@ url="https://metacpan.org/release/IO-Socket-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="ca-certificates perl-net-libidn perl-net-ssleay" -makedepends="perl-dev" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/S/SU/SULLR/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - cd "$builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-json-maybexs/APKBUILD b/system/perl-json-maybexs/APKBUILD index 92a37e687..760b09e19 100644 --- a/system/perl-json-maybexs/APKBUILD +++ b/system/perl-json-maybexs/APKBUILD @@ -3,39 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json-maybexs _pkgreal=JSON-MaybeXS +_author=HAARG +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.004000 pkgrel=0 pkgdesc="Use <Cpanel::JSON::XS> with a fallback to <JSON::XS> and <JSON::PP>" url="https://metacpan.org/release/JSON-MaybeXS" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-cpanel-json-xs" -cpanmakedepends="perl-test-without-module" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-cpanel-json-xs" +makedepends="" +checkdepends="perl-test-without-module" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index ee036d859..ee0c36dc8 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -2,31 +2,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json _pkgreal=JSON +_author=ISHIGAKI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=4.02 pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" url="https://metacpan.org/release/JSON" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -makedepends="perl-dev" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name perllocal.pod -delete find "$pkgdir" -name .packlist -delete diff --git a/system/perl-libwww/APKBUILD b/system/perl-libwww/APKBUILD index 6b62d0b33..61644804c 100644 --- a/system/perl-libwww/APKBUILD +++ b/system/perl-libwww/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-libwww -_realname=libwww-perl -_author1=O -_author2=${_author1}A -_author=${_author2}LDERS +_pkgreal=libwww-perl +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.39 pkgrel=0 pkgdesc="Perl module - World Wide Web library" @@ -15,10 +15,11 @@ depends="perl-http-date perl-http-cookies perl-net-http perl-http-daemon perl-html-parser perl-file-listing perl-www-robotrules perl-http-negotiate perl-uri perl-http-message perl-test-needs perl-lwp-mediatypes perl-encode-locale perl-try-tiny" -makedepends="perl-dev perl-test-fatal perl-test-requiresinternet" +makedepends="" +checkdepends="perl-test-fatal perl-test-requiresinternet" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://cpan.metacpan.org/authors/id/$_author1/$_author2/$_author/libwww-perl-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/libwww-perl-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor diff --git a/system/perl-lwp-mediatypes/APKBUILD b/system/perl-lwp-mediatypes/APKBUILD index b1042949d..d072a2935 100644 --- a/system/perl-lwp-mediatypes/APKBUILD +++ b/system/perl-lwp-mediatypes/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-lwp-mediatypes -_realname=LWP-MediaTypes -_author1=O -_author2=${_author1}A -_author=${_author2}LDERS +_pkgreal=LWP-MediaTypes +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.04 pkgrel=0 pkgdesc="Perl module - guess media type for a file or a URL" @@ -12,29 +12,23 @@ url="https://metacpan.org/release/LWP-MediaTypes" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" +makedepends="" checkdepends="perl-test-fatal" -install= -replaces="perl-libwww" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/$_author1/$_author2/$_author/$_realname-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD index 0d4541a3f..2dd9090bc 100644 --- a/system/perl-mime-charset/APKBUILD +++ b/system/perl-mime-charset/APKBUILD @@ -1,31 +1,33 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-mime-charset +_pkgreal=MIME-Charset +_author=NEZUMI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.012.2 pkgrel=0 pkgdesc="Perl database for MIME character sets" url="https://metacpan.org/pod/MIME::Charset" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0+" -depends="perl perl-encode-eucjpascii perl-encode-jisx0213 perl-encode-hanextra +depends="perl-encode-eucjpascii perl-encode-jisx0213 perl-encode-hanextra perl-pod2-base" +makedepends="" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-$pkgver.tar.gz" -builddir="$srcdir/MIME-Charset-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-module-build-tiny/APKBUILD b/system/perl-module-build-tiny/APKBUILD index 765e79051..95bf7b4b7 100644 --- a/system/perl-module-build-tiny/APKBUILD +++ b/system/perl-module-build-tiny/APKBUILD @@ -3,43 +3,33 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-build-tiny _pkgreal=Module-Build-Tiny +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.039 pkgrel=0 pkgdesc="A tiny replacement for Module::Build" url="https://metacpan.org/release/Module-Build-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-extutils-installpaths perl-extutils-config perl-extutils-helpers perl-test-harness" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-extutils-installpaths perl-extutils-config perl-extutils-helpers perl-test-harness" +checkdepends="perl-dev" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - if [ -e Build.PL ]; then - perl Build.PL --installdirs=vendor || return 1 - else - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - fi -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + perl Build.PL --installdirs=vendor ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" - ./Build install --destdir="$pkgdir" --create_packlist=0 || return 1 + ./Build install --destdir="$pkgdir" --create_packlist=0 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index 72b5d4bb7..9bf6b18a5 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -3,41 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-build _pkgreal=Module-Build +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.4229 pkgrel=0 pkgdesc="Build and install Perl modules" url="https://metacpan.org/release/Module-Build" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - perl Build.PL installdirs=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + perl Build.PL --installdirs=vendor ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" - ./Build install destdir="$pkgdir" + ./Build install --destdir="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-module-install/APKBUILD b/system/perl-module-install/APKBUILD index b610f057c..ead5a4165 100644 --- a/system/perl-module-install/APKBUILD +++ b/system/perl-module-install/APKBUILD @@ -3,37 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-install _pkgreal=Module-Install +_author=ETHER +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.19 pkgrel=1 pkgdesc="Standalone, extensible Perl module installer" url="https://metacpan.org/release/Module-Install" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpanmakedepends="perl-file-remove perl-module-build perl-module-scandeps perl-yaml-tiny" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-dev perl-file-remove perl-module-build perl-module-scandeps + perl-yaml-tiny" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index e9940d7cb..1463561a6 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,43 +3,35 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps +_author=RSCHUPP +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.27 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" url="https://metacpan.org/release/Module-ScanDeps" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpanmakedepends="perl-test-requires" -makedepends="perl-dev $cpanmakedepends perl-test-pod" +depends="perl" +checkdepends="perl-test-requires" +makedepends="perl-test-pod" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/R/RS/RSCHUPP/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - cd "$builddir" - +build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } -build() { - cd "$builddir" - - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - make +check() { + make test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -check() { - cd "$builddir" - make test -} - sha512sums="ab5625f497a9dc9133960c7c9a5867f27f6f0061fa954225cfc53fda39d9b657743ee66a7a96cc1485bba57532fc0447c3b245dd81cf6e6c39522fdd2e308411 Module-ScanDeps-1.27.tar.gz" diff --git a/system/perl-net-http/APKBUILD b/system/perl-net-http/APKBUILD index c476f6c42..69b8d8ff5 100644 --- a/system/perl-net-http/APKBUILD +++ b/system/perl-net-http/APKBUILD @@ -1,17 +1,21 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-http +_pkgreal=Net-HTTP +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.19 pkgrel=0 pkgdesc="Low-level HTTP connection client library for Perl" url="https://metacpan.org/release/Net-HTTP" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-uri" -makedepends="perl-dev" +depends="perl-uri" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz" -builddir="$srcdir"/Net-HTTP-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor diff --git a/system/perl-net-libidn/APKBUILD b/system/perl-net-libidn/APKBUILD index 147252aa3..16ee5fcf8 100644 --- a/system/perl-net-libidn/APKBUILD +++ b/system/perl-net-libidn/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-libidn -_realname=Net-LibIDN +_pkgreal=Net-LibIDN +_author=THOR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.12 pkgrel=4 pkgdesc="Perl bindings for libidn" @@ -11,24 +14,20 @@ license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" makedepends="libidn-dev perl-dev" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # creates file collision among perl modules find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-net-smtp-ssl/APKBUILD b/system/perl-net-smtp-ssl/APKBUILD index 3be9c4aef..622b0e3fc 100644 --- a/system/perl-net-smtp-ssl/APKBUILD +++ b/system/perl-net-smtp-ssl/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-smtp-ssl _pkgreal=Net-SMTP-SSL +_author=RJBS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.04 pkgrel=0 pkgdesc="SSL/TLS support for Net::SMTP" url="https://metacpan.org/release/Net-SMTP-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-io-socket-ssl perl-net-ssleay" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-io-socket-ssl perl-net-ssleay" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD index 593eb4886..0f8520ce4 100644 --- a/system/perl-net-ssleay/APKBUILD +++ b/system/perl-net-ssleay/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-ssleay -_realname=Net-SSLeay +_pkgreal=Net-SSLeay +_author=CHRISN +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.88 pkgrel=0 pkgdesc="Perl extension for using OpenSSL" @@ -12,26 +15,20 @@ depends="perl" makedepends="perl-dev openssl-dev zlib-dev" checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make } check() { - cd "$builddir" make test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD index 28d409678..5ba39c600 100644 --- a/system/perl-pod2-base/APKBUILD +++ b/system/perl-pod2-base/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod2-base +_pkgreal=POD2-Base +_author=FERREIRA +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.043 pkgrel=0 pkgdesc="Base module for POD translations" @@ -8,23 +12,21 @@ url="https://metacpan.org/pod/distribution/POD2-Base/lib/POD2/Base.pod" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0+" depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/F/FE/FERREIRA/POD2-Base-$pkgver.tar.gz" -builddir="$srcdir/POD2-Base-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD index 1874fb094..a4991b8f2 100644 --- a/system/perl-sgmls/APKBUILD +++ b/system/perl-sgmls/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sgmls +_pkgreal=SGMLSpm +_author=RAAB +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.1 pkgrel=0 pkgdesc="Perl module for processing output from sgmls and nsgmls" @@ -8,29 +12,26 @@ url="https://metacpan.org/pod/release/RAAB/SGMLSpm-1.1/lib/SGMLS.pm" arch="noarch" license="GPL-2.0-only" depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/R/RA/RAAB/SGMLSpm-$pkgver.tar.gz" -builddir="$srcdir/SGMLSpm-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { chmod -R ug+w "$builddir" - cd "$builddir" default_prepare } build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-sub-uplevel/APKBUILD b/system/perl-sub-uplevel/APKBUILD index 6c3954811..4669dffd3 100644 --- a/system/perl-sub-uplevel/APKBUILD +++ b/system/perl-sub-uplevel/APKBUILD @@ -1,7 +1,10 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-uplevel -_realname=Sub-Uplevel +_pkgreal=Sub-Uplevel +_author=DAGOLDEN +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.2800 pkgrel=0 pkgdesc="Perl module to apparently run a function in a higher stack frame" @@ -9,26 +12,22 @@ url="https://metacpan.org/release/Sub-Uplevel" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz" -builddir="$srcdir/$_realname-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } diff --git a/system/perl-test-exception/APKBUILD b/system/perl-test-exception/APKBUILD index a02e25ed0..7cd100624 100644 --- a/system/perl-test-exception/APKBUILD +++ b/system/perl-test-exception/APKBUILD @@ -3,34 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-exception _pkgreal=Test-Exception +_author=EXODIST +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.43 pkgrel=0 pkgdesc="Perl module for testing exception-based code" url="https://metacpan.org/release/Test-Exception" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-sub-uplevel" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-sub-uplevel" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make install DESTDIR="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD index f767bfb56..f6336e2af 100644 --- a/system/perl-test-fatal/APKBUILD +++ b/system/perl-test-fatal/APKBUILD @@ -3,37 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-fatal _pkgreal=Test-Fatal +_author=RJBS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.014 pkgrel=1 -pkgdesc="incredibly simple helpers for testing code with exceptions" +pkgdesc="Simple helpers for testing code with exceptions" url="https://metacpan.org/release/Test-Fatal" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-try-tiny" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-try-tiny" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-harness/APKBUILD b/system/perl-test-harness/APKBUILD index 4bc0b88a5..ea2d38eb8 100644 --- a/system/perl-test-harness/APKBUILD +++ b/system/perl-test-harness/APKBUILD @@ -1,61 +1,35 @@ -# Automatically generated by apkbuild-cpan, template 1 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-harness _pkgreal=Test-Harness +_author=LEONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=3.42 pkgrel=0 pkgdesc="Run Perl standard test scripts with statistics" url="https://metacpan.org/release/Test-Harness" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc $pkgname-utils" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -utils() { - pkgdesc="$pkgdesc (utilities)" - depends="$pkgname perl" - replaces="perl-utils" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ -} - -doc() { - default_doc - replaces="perl-doc" - local file; for file in $(find "$pkgdir" -name "*.pod"); do - file=${file#$pkgdir/} - mkdir -p "$subpkgdir"/${file%/*} - mv "$pkgdir"/$file "$subpkgdir"/$file - done + rm "$pkgdir"/usr/bin/prove } sha512sums="c9a3feec242772dd597be5e304dcf536c117dcad01cc2e22b8881e2bf24e5e3b1a119f3a29152a1602b6a2072b555f38c0fed8211198c2b2f6ee612df3d09b00 Test-Harness-3.42.tar.gz" diff --git a/system/perl-test-leaktrace/APKBUILD b/system/perl-test-leaktrace/APKBUILD index 36a7c4294..c5864a3b3 100644 --- a/system/perl-test-leaktrace/APKBUILD +++ b/system/perl-test-leaktrace/APKBUILD @@ -3,35 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-leaktrace _pkgreal=Test-LeakTrace +_author=LEEJO +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.16 pkgrel=0 -pkgdesc="Traces memory leaks" +pkgdesc="Perl module for tracing memory leaks while testing" url="https://metacpan.org/release/Test-LeakTrace" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/$_pkgreal-$pkgver.tar.gz - " +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index f952063f8..439a52ade 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-needs +_pkgreal=Test-Needs +_author=HAARG +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.002006 pkgrel=0 pkgdesc="Perl module for skipping tests when modules aren't found" @@ -8,25 +12,21 @@ url="https://metacpan.org/release/Test-Needs" arch="noarch" license="Artistic-2.0" depends="perl" -makedepends="$depends" -install="" +makedepends="" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-Needs-$pkgver.tar.gz" -builddir="$srcdir/Test-Needs-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-nowarnings/APKBUILD b/system/perl-test-nowarnings/APKBUILD index 283bdde62..037381654 100644 --- a/system/perl-test-nowarnings/APKBUILD +++ b/system/perl-test-nowarnings/APKBUILD @@ -1,32 +1,32 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-nowarnings +_pkgreal=Test-NoWarnings +_author=ADAMK +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.04 pkgrel=2 pkgdesc="Perl module to ensure no warnings occur during testing" url="https://metacpan.org/release/Test-NoWarnings" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-test-simple" -makedepends="perl-dev" -install="" +depends="perl-test-simple" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-NoWarnings-$pkgver.tar.gz" -builddir="$srcdir"/Test-NoWarnings-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD index 9385c2c1c..8f5bbc7ee 100644 --- a/system/perl-test-pod/APKBUILD +++ b/system/perl-test-pod/APKBUILD @@ -3,40 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-pod _pkgreal=Test-Pod +_author=ETHER +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.52 pkgrel=0 pkgdesc="Check for POD errors in files" url="https://metacpan.org/release/Test-Pod" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-requires/APKBUILD b/system/perl-test-requires/APKBUILD index a352f8aed..b32b599b4 100644 --- a/system/perl-test-requires/APKBUILD +++ b/system/perl-test-requires/APKBUILD @@ -3,39 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-requires _pkgreal=Test-Requires +_author=TOKUHIROM +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.10 pkgrel=0 pkgdesc="Checks to see if a Perl module can be loaded" url="https://metacpan.org/release/Test-Requires" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-requiresinternet/APKBUILD b/system/perl-test-requiresinternet/APKBUILD index 4121966e5..017ff23e6 100644 --- a/system/perl-test-requiresinternet/APKBUILD +++ b/system/perl-test-requiresinternet/APKBUILD @@ -2,41 +2,33 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-requiresinternet _pkgreal=Test-RequiresInternet +_author=MALLEN +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.05 pkgrel=1 pkgdesc="Easily test network connectivity" url="https://metacpan.org/release/Test-RequiresInternet" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -makedepends="perl-dev" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/M/MA/MALLEN/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') +build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } -build() { - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - make +check() { + make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -check() { - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - make test -} - sha512sums="572af3e6fdfb90df3a58ba6eaf571717b294a54fff4b3f597fd177f1eb91fb1c929cb808f8d219f692314a944cf41dc1afab41f5a0dd2185054c08fec69e66c3 Test-RequiresInternet-0.05.tar.gz" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index 8eaaecffa..70bb4ead9 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple +_author=EXODIST +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.302168 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -provides="perl-test-tester" -depends="" -makedepends="perl-dev" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { diff --git a/system/perl-test-warn/APKBUILD b/system/perl-test-warn/APKBUILD index 30fab337c..8bfa39a7d 100644 --- a/system/perl-test-warn/APKBUILD +++ b/system/perl-test-warn/APKBUILD @@ -3,41 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-warn _pkgreal=Test-Warn +_author=BIGJ +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.36 pkgrel=0 pkgdesc="Perl extension to test methods for warnings" url="https://metacpan.org/release/Test-Warn" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="perl-sub-uplevel" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl-sub-uplevel" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/B/BI/BIGJ/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-test-without-module/APKBUILD b/system/perl-test-without-module/APKBUILD index b39692dc2..5f66fa835 100644 --- a/system/perl-test-without-module/APKBUILD +++ b/system/perl-test-without-module/APKBUILD @@ -2,30 +2,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-without-module _pkgreal=Test-Without-Module +_author=CORION +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.20 pkgrel=0 pkgdesc="Test fallback behaviour in absence of Perl modules" url="https://metacpan.org/release/Test-Without-Module" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -makedepends="perl-dev" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/C/CO/CORION/Test-Without-Module-$pkgver.tar.gz" -builddir="$srcdir"/$_pkgreal-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD index 0ce6d0cfb..36129e2a3 100644 --- a/system/perl-try-tiny/APKBUILD +++ b/system/perl-try-tiny/APKBUILD @@ -3,38 +3,31 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-try-tiny _pkgreal=Try-Tiny +_author=ETHER +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=0.30 pkgrel=0 pkgdesc="Minimal Perl try/catch with proper environment preservation" url="https://metacpan.org/release/Try-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD index 5d7d91ea3..5bff8e644 100644 --- a/system/perl-unicode-linebreak/APKBUILD +++ b/system/perl-unicode-linebreak/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-unicode-linebreak +_pkgreal=Unicode-LineBreak +_author=NEZUMI +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=2019.001 _univer=8.0.0 # update this and unicode.org URLs if sombok is ever updated pkgrel=0 @@ -8,33 +12,25 @@ pkgdesc="Perl implementation of the UAX#14 Unicode line-breaking algorithm" url="https://metacpan.org/release/Unicode-LineBreak" arch="all" license="Artistic-1.0-Perl AND GPL-2.0+" -depends="perl perl-mime-charset" +depends="perl-mime-charset" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-$pkgver.tar.gz +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz https://www.unicode.org/Public/$_univer/ucd/auxiliary/GraphemeBreakTest.txt https://www.unicode.org/Public/$_univer/ucd/auxiliary/LineBreakTest.txt" -builddir="$srcdir/Unicode-LineBreak-$pkgver" - -prepare() { - cd "$builddir" - default_prepare - cp "$srcdir"/*Test.txt "$builddir"/test-data -} +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" + cp "$srcdir"/*Test.txt "$builddir"/test-data PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 9d8fe204e..13763a256 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -1,6 +1,10 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-uri +_pkgreal=URI +_author=OALDERS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.76 pkgrel=0 pkgdesc="Perl library for URI manipulation" @@ -8,26 +12,23 @@ url="https://metacpan.org/release/URI" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" -makedepends="$depends" +makedepends="" checkdepends="perl-test-needs" subpackages="$pkgname-doc" provides="perl-uri-escape=$pkgver-r$pkgrel" -source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$pkgver.tar.gz" -builddir="$srcdir/URI-$pkgver" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-www-robotrules/APKBUILD b/system/perl-www-robotrules/APKBUILD index 9911f3670..1bd5c777f 100644 --- a/system/perl-www-robotrules/APKBUILD +++ b/system/perl-www-robotrules/APKBUILD @@ -1,32 +1,32 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-www-robotrules +_pkgreal=WWW-RobotRules +_author=GAAS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=6.02 pkgrel=2 pkgdesc="Perl module for parsing /robots.txt files on HTTP servers" url="https://metacpan.org/release/WWW-RobotRules" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl perl-uri" -makedepends="perl-dev" -replaces="perl-libwww" +depends="perl-uri" +makedepends="" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz" -builddir="$srcdir"/WWW-RobotRules-$pkgver +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-yaml-syck/APKBUILD b/system/perl-yaml-syck/APKBUILD index 0aeefc7da..28494960f 100644 --- a/system/perl-yaml-syck/APKBUILD +++ b/system/perl-yaml-syck/APKBUILD @@ -3,40 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-syck _pkgreal=YAML-Syck +_author=TODDR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.31 pkgrel=0 pkgdesc="Fast, lightweight YAML loader and dumper" url="https://metacpan.org/release/YAML-Syck" arch="all" license="MIT" -depends="" +depends="perl" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/perl-yaml-tiny/APKBUILD b/system/perl-yaml-tiny/APKBUILD index 4570c5fb0..2419fdfb6 100644 --- a/system/perl-yaml-tiny/APKBUILD +++ b/system/perl-yaml-tiny/APKBUILD @@ -3,39 +3,32 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-tiny _pkgreal=YAML-Tiny +_author=ETHER +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} pkgver=1.73 pkgrel=1 pkgdesc="YAML manipulation library for Perl" url="https://metacpan.org/release/YAML-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -cpandepends="" -cpanmakedepends="perl-json-maybexs" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-json-maybexs" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { - cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD index 4fefa4e22..f5d28b236 100644 --- a/system/python3/APKBUILD +++ b/system/python3/APKBUILD @@ -3,7 +3,7 @@ pkgname=python3 pkgver=3.6.9 _basever="${pkgver%.*}" -pkgrel=1 +pkgrel=2 pkgdesc="A high-level scripting language" url="https://www.python.org" arch="all" @@ -41,6 +41,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz musl-find_library.patch fix-xattrs-glibc.patch CVE-2019-16056.patch + CVE-2019-16935.patch " builddir="$srcdir/Python-$pkgver" @@ -60,6 +61,8 @@ builddir="$srcdir/Python-$pkgver" # - CVE-2019-9948 # 3.6.9-r1: # - CVE-2019-16056 +# 3.6.9-r2: +# - CVE-2019-16935 prepare() { default_prepare @@ -139,13 +142,14 @@ EOF # dumb fail="$fail test_ssl" # tries to do SSLv2 which we have disabled in OpenSSL - # needs network but doesn't declare it - fail="$fail test_normalization" + # hangs when run with other tests - run separately + fail="$fail test_threading" - # defaults from Tools/scripts/run_tests.py, with -network added - use="all,-largefile,-audio,-gui,-network" + # defaults from Tools/scripts/run_tests.py + -network,-urlfetch + use="all,-largefile,-audio,-gui,-network,-urlfetch" make quicktest TESTOPTS="--use '$use' --exclude $fail" + make test TESTOPTS="test_threading" } package() { @@ -188,4 +192,5 @@ wininst() { sha512sums="05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819 Python-3.6.9.tar.xz ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch 37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad fix-xattrs-glibc.patch -1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0 CVE-2019-16056.patch" +1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0 CVE-2019-16056.patch +7f94d887c81f79d90afd4a9621547c13cbdd0232250f62a686b26a63160a4d286a6db9b342d06b9b63af64f994835b489c37bab499a2093c3c2585dc7a04d8a1 CVE-2019-16935.patch" diff --git a/system/python3/CVE-2019-16935.patch b/system/python3/CVE-2019-16935.patch new file mode 100644 index 000000000..567eb90fc --- /dev/null +++ b/system/python3/CVE-2019-16935.patch @@ -0,0 +1,80 @@ +From 1698cacfb924d1df452e78d11a4bf81ae7777389 Mon Sep 17 00:00:00 2001 +From: Victor Stinner <vstinner@redhat.com> +Date: Sat, 28 Sep 2019 09:33:00 +0200 +Subject: [PATCH] bpo-38243, xmlrpc.server: Escape the server_title (GH-16373) + (GH-16441) + +Escape the server title of xmlrpc.server.DocXMLRPCServer +when rendering the document page as HTML. + +(cherry picked from commit e8650a4f8c7fb76f570d4ca9c1fbe44e91c8dfaa) +--- + Lib/test/test_docxmlrpc.py | 16 ++++++++++++++++ + Lib/xmlrpc/server.py | 3 ++- + .../2019-09-25-13-21-09.bpo-38243.1pfz24.rst | 3 +++ + 3 files changed, 21 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst + +diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py +index 00903337c07c2..d2adb21af0fb3 100644 +--- a/Lib/test/test_docxmlrpc.py ++++ b/Lib/test/test_docxmlrpc.py +@@ -1,5 +1,6 @@ + from xmlrpc.server import DocXMLRPCServer + import http.client ++import re + import sys + from test import support + threading = support.import_module('threading') +@@ -193,6 +194,21 @@ def test_annotations(self): + b'method_annotation</strong></a>(x: bytes)</dt></dl>'), + response.read()) + ++ def test_server_title_escape(self): ++ # bpo-38243: Ensure that the server title and documentation ++ # are escaped for HTML. ++ self.serv.set_server_title('test_title<script>') ++ self.serv.set_server_documentation('test_documentation<script>') ++ self.assertEqual('test_title<script>', self.serv.server_title) ++ self.assertEqual('test_documentation<script>', ++ self.serv.server_documentation) ++ ++ generated = self.serv.generate_html_documentation() ++ title = re.search(r'<title>(.+?)</title>', generated).group() ++ documentation = re.search(r'<p><tt>(.+?)</tt></p>', generated).group() ++ self.assertEqual('<title>Python: test_title<script></title>', title) ++ self.assertEqual('<p><tt>test_documentation<script></tt></p>', documentation) ++ + + if __name__ == '__main__': + unittest.main() +diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py +index 3e0dca027f068..efe593748968c 100644 +--- a/Lib/xmlrpc/server.py ++++ b/Lib/xmlrpc/server.py +@@ -106,6 +106,7 @@ def export_add(self, x, y): + + from xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode + from http.server import BaseHTTPRequestHandler ++import html + import http.server + import socketserver + import sys +@@ -904,7 +905,7 @@ def generate_html_documentation(self): + methods + ) + +- return documenter.page(self.server_title, documentation) ++ return documenter.page(html.escape(self.server_title), documentation) + + class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): + """XML-RPC and documentation request handler class. +diff --git a/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst +new file mode 100644 +index 0000000000000..98d7be129573a +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst +@@ -0,0 +1,3 @@ ++Escape the server title of :class:`xmlrpc.server.DocXMLRPCServer` ++when rendering the document page as HTML. ++(Contributed by Dong-hee Na in :issue:`38243`.) diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 2cb62343a..3bad54e5e 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=sudo -pkgver=1.8.27 +pkgver=1.8.28 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -23,13 +23,15 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz fix-cross-compile.patch musl-fix-headers.patch - test-suite.patch + SIGUNUSED.patch " builddir="$srcdir"/$pkgname-$_realver # secfixes: # 1.8.20_p2-r0: -# - CVE-2017-1000368 +# - CVE-2017-1000368 +# 1.8.28: +# - CVE-2019-14287 build() { ./configure \ @@ -45,6 +47,11 @@ build() { --with-passprompt="[sudo] Password for %p: " \ --with-insults=disabled \ --with-all-insults + + # Workaround until SIGUNUSED.patch is not needed anymore + rm lib/util/mksiglist.h lib/util/mksigname.h + make -C lib/util DEVEL=1 mksiglist.h mksigname.h + make } @@ -60,7 +67,7 @@ package() { rm -rf "$pkgdir"/var/run } -sha512sums="0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac sudo-1.8.27.tar.gz +sha512sums="09e589cdfd18d7c43b0859a0e11c008b3cb995ae4f8c89c717c5242db9e5696361eb574ebe74a0b5316afffb3a8037f7a7f3c249176e8ed9caffeb4cd860ddc7 sudo-1.8.28.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch -3feb9f586fb36cdddaf61523926554533d73b4b03e7bfe5da40b754d68c4cc58c796310cc3a3419dd0d87d30d836d5f9921f5ea3c7c7a0099626f49c161279dc test-suite.patch" +2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch" diff --git a/system/sudo/SIGUNUSED.patch b/system/sudo/SIGUNUSED.patch new file mode 100644 index 000000000..969c3e82d --- /dev/null +++ b/system/sudo/SIGUNUSED.patch @@ -0,0 +1,16 @@ +--- sudo-1.8.28/lib/util/siglist.in 2019-10-10 11:32:54.000000000 -0500 ++++ sudo-1.8.28/lib/util/siglist.in 2019-10-14 16:42:46.259938722 -0500 +@@ -17,11 +17,12 @@ + EMT EMT trap + FPE Floating point exception + KILL Killed ++# before UNUSED (musl defines them as the same number) ++ SYS Bad system call + # before BUS (Older Linux doesn't really have a BUS, but defines it to UNUSED) + UNUSED Unused + BUS Bus error + SEGV Memory fault +- SYS Bad system call + PIPE Broken pipe + ALRM Alarm clock + TERM Terminated diff --git a/system/sudo/test-suite.patch b/system/sudo/test-suite.patch deleted file mode 100644 index eb19ff09c..000000000 --- a/system/sudo/test-suite.patch +++ /dev/null @@ -1,407 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller <Todd.Miller@sudo.ws> -# Date 1552053510 25200 -# Node ID e82a381f4f3de693f880aab2781fd65c01030ec0 -# Parent 09a915110812b9d6603995aa27be94b71c5df1e7 -Test cvtsudoers stdout and stderr separately. -Fixes a test failure on systems with musl libc. Bug #873 - -diff -r 09a915110812 -r e82a381f4f3d MANIFEST ---- a/MANIFEST Wed Mar 06 20:15:11 2019 -0700 -+++ b/MANIFEST Fri Mar 08 06:58:30 2019 -0700 -@@ -450,6 +450,7 @@ - plugins/sudoers/regress/cvtsudoers/test24.sh - plugins/sudoers/regress/cvtsudoers/test25.out.ok - plugins/sudoers/regress/cvtsudoers/test25.sh -+plugins/sudoers/regress/cvtsudoers/test26.err.ok - plugins/sudoers/regress/cvtsudoers/test26.out.ok - plugins/sudoers/regress/cvtsudoers/test26.sh - plugins/sudoers/regress/cvtsudoers/test27.out.ok -@@ -465,6 +466,7 @@ - plugins/sudoers/regress/cvtsudoers/test31.conf - plugins/sudoers/regress/cvtsudoers/test31.out.ok - plugins/sudoers/regress/cvtsudoers/test31.sh -+plugins/sudoers/regress/cvtsudoers/test32.err.ok - plugins/sudoers/regress/cvtsudoers/test32.out.ok - plugins/sudoers/regress/cvtsudoers/test32.sh - plugins/sudoers/regress/cvtsudoers/test33.out.ok -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh ---- a/plugins/sudoers/regress/cvtsudoers/test1.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user and host filters - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh ---- a/plugins/sudoers/regress/cvtsudoers/test10.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test command defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh ---- a/plugins/sudoers/regress/cvtsudoers/test11.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh ---- a/plugins/sudoers/regress/cvtsudoers/test12.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh ---- a/plugins/sudoers/regress/cvtsudoers/test13.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh ---- a/plugins/sudoers/regress/cvtsudoers/test14.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh ---- a/plugins/sudoers/regress/cvtsudoers/test15.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh ---- a/plugins/sudoers/regress/cvtsudoers/test16.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh ---- a/plugins/sudoers/regress/cvtsudoers/test17.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh ---- a/plugins/sudoers/regress/cvtsudoers/test18.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF - user1, user2, user3, %group1 ALL = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh ---- a/plugins/sudoers/regress/cvtsudoers/test19.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test filters and pruning; alias contents don't get pruned - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh ---- a/plugins/sudoers/regress/cvtsudoers/test2.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user and host filters, expanding aliases - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh ---- a/plugins/sudoers/regress/cvtsudoers/test20.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test20.conf <<EOF - Defaults:SOMEUSERS authenticate, timestamp_timeout=0 - User_Alias SOMEUSERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh ---- a/plugins/sudoers/regress/cvtsudoers/test21.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test21.conf <<EOF - Defaults authenticate, timestamp_timeout=0 - User_Alias FULLTIMERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh ---- a/plugins/sudoers/regress/cvtsudoers/test22.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP base filtering. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh ---- a/plugins/sudoers/regress/cvtsudoers/test23.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,6 +3,5 @@ - # Test round-tripping of sudoers -> LDIF -> sudoers - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \ - ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#' -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh ---- a/plugins/sudoers/regress/cvtsudoers/test24.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,6 +3,5 @@ - # Test round-tripping of LDIF -> sudoers -> LDIF - # - --exec 2>&1 - ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \ - ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh ---- a/plugins/sudoers/regress/cvtsudoers/test25.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDIF base64 attribute parsing - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - # defaults, SUDOers, sudo.ws - dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -0,0 +1,3 @@ -+cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== -+cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= -+cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok ---- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -1,3 +0,0 @@ --cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== --cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= --cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh ---- a/plugins/sudoers/regress/cvtsudoers/test26.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDIF invalid base64 attribute parsing - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - # defaults, SUDOers, sudo.ws - dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh ---- a/plugins/sudoers/regress/cvtsudoers/test27.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test base64 encoding of non-safe strings - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF - Defaults badpass_message="Bad password¡" - -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh ---- a/plugins/sudoers/regress/cvtsudoers/test28.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP sudoOrder when converting to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh ---- a/plugins/sudoers/regress/cvtsudoers/test29.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP sudoOrder when converting to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh ---- a/plugins/sudoers/regress/cvtsudoers/test3.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test group and host filters - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh ---- a/plugins/sudoers/regress/cvtsudoers/test30.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -4,7 +4,6 @@ - # See https://bugzilla.sudo.ws/show_bug.cgi?id=853 - # - --exec 2>&1 - ./cvtsudoers -c "" -e -f json <<EOF - Cmnd_Alias CMDA=/path/to/cmda - Cmnd_Alias CMDB=/path/to/cmdb -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh ---- a/plugins/sudoers/regress/cvtsudoers/test31.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf with padding - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test31.conf <<EOF - Defaults authenticate, timestamp_timeout=0 - User_Alias FULLTIMERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -0,0 +1,1 @@ -+cvtsudoers: too many sudoers entries, maximum 10 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok ---- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -1,4 +1,3 @@ --cvtsudoers: too many sudoers entries, maximum 10 - dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com - objectClass: top - objectClass: sudoRole -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh ---- a/plugins/sudoers/regress/cvtsudoers/test32.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf with invalid padding - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF - user0 ALL = (ALL:ALL) ALL - user1 ALL = (ALL:ALL) ALL -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh ---- a/plugins/sudoers/regress/cvtsudoers/test33.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh ---- a/plugins/sudoers/regress/cvtsudoers/test4.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test group and host filters, expanding aliases - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh ---- a/plugins/sudoers/regress/cvtsudoers/test5.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test defaults type filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh ---- a/plugins/sudoers/regress/cvtsudoers/test6.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test global defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh ---- a/plugins/sudoers/regress/cvtsudoers/test7.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh ---- a/plugins/sudoers/regress/cvtsudoers/test8.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test runas defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh ---- a/plugins/sudoers/regress/cvtsudoers/test9.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test host defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers - - exit 0 - diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 3b1ee667c..584989ea8 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.2100 +pkgver=8.1.2131 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -79,6 +79,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="57f7c0970f7627ecd56972647d3b0826cd28c800dfaded1b51787bade859420f9c256fb66d589656c7c03a74b836291c84d6dd92157f2327444f575be33efdc0 vim-8.1.2100.tar.gz +sha512sums="4f4a1a748c58796dcdcb5c48562cf71372bd7b104c66b49470613da0b6de461a2f749eb06dca4c02c1e0fffb699f8fddcda3561b02c52c44f779b7f9f044c160 vim-8.1.2131.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" |