diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /app-text/wgetpaste | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'app-text/wgetpaste')
| -rw-r--r-- | app-text/wgetpaste/Manifest | 5 | ||||
| -rw-r--r-- | app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch | 40 | ||||
| -rw-r--r-- | app-text/wgetpaste/metadata.xml | 8 | ||||
| -rw-r--r-- | app-text/wgetpaste/wgetpaste-2.29-r1.ebuild (renamed from app-text/wgetpaste/wgetpaste-2.29.ebuild) | 2 |
4 files changed, 51 insertions, 4 deletions
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest index 6754f4adf273..a60a1934a85e 100644 --- a/app-text/wgetpaste/Manifest +++ b/app-text/wgetpaste/Manifest @@ -1,6 +1,7 @@ +AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6 EBUILD wgetpaste-2.28-r2.ebuild 779 BLAKE2B ed1ba770ecf40257f2db99a7a84e4cbb264264244d407db4659ea82d11afd6f6a1b8960444d11165d413955ab88a3f7df45da734444940f322f0aac18101bbb5 SHA512 851fd5ea306c1f99645096671dcda51a84791863d171bd007b92c47de760db34c6eb15feca2b7d7cb21827f2d00dd74318c715e3f97e031c8e017cbaef54239d -EBUILD wgetpaste-2.29.ebuild 738 BLAKE2B ab009023d2ca5d29af4d1657726c9e94f0825c2003807b5c41d77e2649718b37c302e3805db07d3dc9ed601bc35f37eea00c3035a6fe322327417280b0b3d505 SHA512 6a6d96d076f5533bf1e4f2e7981dd907d88e486f09b138a6812dd249f64ab708dfc9c5b929d2623abc1a84e1e1b3a1204e65807ee8f0d8b88c110d352b72e9e7 -MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5 +EBUILD wgetpaste-2.29-r1.ebuild 787 BLAKE2B bb4190d4de6240b39244ec2b1b1a87af2599d81494adbdfe0682bfcdf4edf8dd79f90ae79ffc04acb871a8bcad7d566ab5f6472b76e107516067c598b21b7905 SHA512 87a551c9576cf10096f80588babefcd8fcb285c4e57109c46683b1a523aee3d2b202d479337fda3c654155c5fb1f1c53a1f02cd1c090b84f86f723061dbc0d28 +MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278 diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch new file mode 100644 index 000000000000..0af9a6f855d7 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch @@ -0,0 +1,40 @@ +From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <zlin@exherbo.org> +Date: Tue, 23 Jul 2019 00:16:19 +0200 +Subject: [PATCH] Fix handling of bpaste urls. + +--- + wgetpaste | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/wgetpaste b/wgetpaste +index 585fcd9..99eb7f1 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb + xml+velocity xml xquery xslt xtend yaml" + EXPIRATIONS_pinnwand="1day 1week 1month never" + POST_pinnwand="submit=Paste! % % lexer expiry % code" +-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|' ++REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" ++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' + + ### errors + die() { +@@ -550,11 +551,15 @@ postdata() { + + # get url from response from server + geturl() { +- local regex ++ local regex location + regex=REGEX_URL_$ENGINE ++ location=REGEX_LOC_$ENGINE + if [[ -n ${!regex} ]]; then + [[ needstdout = $1 ]] && return 0 + sed -n -e "${!regex}" <<< "$*" ++ elif [[ -n ${!location} ]]; then ++ [[ needstdout = $1 ]] && return 1 ++ sed -n -e "s|^.*Location: ${!location}|p" <<< "$*" + else + [[ needstdout = $1 ]] && return 1 + sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*" diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml index 23d91c3c4034..1aa3c4c3cd76 100644 --- a/app-text/wgetpaste/metadata.xml +++ b/app-text/wgetpaste/metadata.xml @@ -6,7 +6,11 @@ <name>Maxim Koltsov</name> </maintainer> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> + <email>zlogene@gentoo.org</email> + <name>Mikle Kolyada</name> </maintainer> + <upstream> + <remote-id type="github">zlin/wgetpaste</remote-id> + <bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to> + </upstream> </pkgmetadata> diff --git a/app-text/wgetpaste/wgetpaste-2.29.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild index ff53674f0697..175617a320c6 100644 --- a/app-text/wgetpaste/wgetpaste-2.29.ebuild +++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild @@ -15,6 +15,8 @@ IUSE="+ssl" DEPEND="" RDEPEND="net-misc/wget[ssl?]" +PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" ) + src_prepare() { sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die default |