| 1 |
commit: db1716e1306ad0961eccb313a0bb33fca2c73f5a |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 20:22:47 2023 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 20:26:38 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db1716e1 |
| 7 |
|
| 8 |
app-editors/emacs: Fix multiple command injection vulnerabilities |
| 9 |
|
| 10 |
This fixes command injection vulnerabilities in etags (CVE-2022-48337), |
| 11 |
ruby-mode (CVE-2022-48338), and htmlfontify (CVE-2022-48339) for Emacs |
| 12 |
slots 25, 26, 27, and 28. |
| 13 |
|
| 14 |
Note that Emacs 25 and 26 are not affected by the ruby-mode |
| 15 |
vulnerability because function ruby-find-library-file did not yet |
| 16 |
exist (and there is no call to the gem command in ruby-mode.el). |
| 17 |
|
| 18 |
Emacs 18 is not affected by either of them: It doesn't have ruby-mode |
| 19 |
and htmlfontify, and we no longer install the ctags and etags binaries. |
| 20 |
|
| 21 |
Bug: https://bugs.gentoo.org/897950 |
| 22 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 23 |
|
| 24 |
app-editors/emacs/Manifest | 6 +- |
| 25 |
...emacs-26.3-r12.ebuild => emacs-25.3-r16.ebuild} | 72 ++++++++-------------- |
| 26 |
...emacs-26.3-r12.ebuild => emacs-26.3-r13.ebuild} | 2 +- |
| 27 |
...emacs-27.2-r10.ebuild => emacs-27.2-r11.ebuild} | 2 +- |
| 28 |
.../{emacs-28.2-r5.ebuild => emacs-28.2-r6.ebuild} | 2 +- |
| 29 |
5 files changed, 33 insertions(+), 51 deletions(-) |
| 30 |
|
| 31 |
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest |
| 32 |
index d3937eae9e55..dcb1a07fa537 100644 |
| 33 |
--- a/app-editors/emacs/Manifest |
| 34 |
+++ b/app-editors/emacs/Manifest |
| 35 |
@@ -1,14 +1,16 @@ |
| 36 |
DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26 |
| 37 |
DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 |
| 38 |
DIST emacs-25.3-patches-4.tar.xz 5164 BLAKE2B 30ef1e7ac6ee9a702678899cb27ea9c321eb0711d55917118ec99ea9e060e79bae179172d0a2dda5821c19902f6e0813e17ac71c198cd814c265838f96883b87 SHA512 ea487de3bb792386510c23c295441438c2fc4eae085fe9d41e5e16181fd4265c1d205b360ce977070a43343feeafac5b9392ea39414f2b170d7051f89ed58502 |
| 39 |
+DIST emacs-25.3-patches-5.tar.xz 6120 BLAKE2B dc56e5f9bc5368062260bb82123f2874c15daa2b90514db5c1e8b59ac44bfc7cdb590259905b2ffb1e38af00dcf195067d116a1cb5fa1a8eb102904f27b6e949 SHA512 21f2045d1c64151923d62c180f39b3c9eba9e65881096613219df1705f525b8eafa91e0a0dd3688b92b0acc7f41035ee319b09c191131a9e05693d1f25a71750 |
| 40 |
DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f |
| 41 |
DIST emacs-26.3-patches-3.tar.xz 4160 BLAKE2B ae6fac12a2d2d35c31c895f1be9104b54c283cf4385d21e0ccd3825a3349d60495e441a5fa9f535d4b3d4c60da530ee036a475643cb11862f2a6e1bb44dc7deb SHA512 1edfdbbe6a97ffcdb17facc90336dd6f8d3d397bc95cf06fa170a4ca68e653226de8a5c2001d8dc3d3a0144d50421f2208c6fa3a816123ef952cb25df4aace49 |
| 42 |
-DIST emacs-26.3-patches-4.tar.xz 4520 BLAKE2B 32992d3e3e122fd91ccdde60bcb2f7483033670e4680c6bccdf1f686c444628a1ef325657eb9b50fb6abfddc24c3f59b88ce5a4c142718f33f0efb6a6eff1234 SHA512 47e604a24b950ac019644cac06c40da09b941dde5e4d42bc72f0a256333e38663c79583bda97706e565eca08ac5802b603f3db13ed7075799e7ef24aba6454a9 |
| 43 |
+DIST emacs-26.3-patches-5.tar.xz 5484 BLAKE2B dc2011b35d948d6106cfa4fd7f2ca5d4591b91e93e2417cee09a5ec5e3ac74e5284c170305e606ee45c9d31b1833ccb10c1ac224f19433a341465298c36165f0 SHA512 f0a6094d72c8879707e914e3cc3526d814216e84e9358e211a4f32e5d4c5958664ce3e3cca217629e2a3324bcb7ac2500d333b1c395f156757210f602d7818d5 |
| 44 |
DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 |
| 45 |
DIST emacs-27.2-patches-4.tar.xz 10104 BLAKE2B c4a6651744583ed6d85a8f2f27f86999b6cea76229feb6423679f9b9da88e5ac2606fdb6933b4a5c2ada31ac760f3921721a0fd84912a81b8727c0eef84984ae SHA512 fd16fa75e2453c6d3562ff3e98cebc24960774fdc8f0e72ae838376cec090308934e11be8df98fc7a100e14125cb096f23bcb29955e7c809090105ddc51495d6 |
| 46 |
-DIST emacs-27.2-patches-5.tar.xz 10460 BLAKE2B 045d9b8af154510d5780c0e3623d6839180cf395a88df1e40f9bb168f84df636e36f02681051ecd4e66a5095a7e9004005faf4c7047253fca22b9e3d8cc61570 SHA512 137a6a4f7f2c5511d001edc4386b7a9b00901faa49c9f69978f74ead838b686fe8f076da44780987ffb5e064f8a76f23f6887dfd9b5f1dec3b35b17d594d5c33 |
| 47 |
+DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B ed8bfb8b2c086423e7bf9f8de5ffb929aa63d8b2781361a8a9d274124a9df52ececdb38c3d4d7d0f0d0fa3a8eaea337c0078929967b073a70209ecdb2bb4cb58 SHA512 11f8af976148c957aebaa5fd2edd46b12ffe24036c09c20a61c47e65d8a2febe6480636be2a7f8f3f7c70a8da7091c2a7c254fd853bde56ec45d7db6a9ca94f5 |
| 48 |
DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9 |
| 49 |
DIST emacs-28.2-patches-1.tar.xz 3404 BLAKE2B af0ea87f8406b3fe646bc32fea5866c1c7bdeeb5bb5ef733a361cf31f96b72b0dc6a7afb9a166f6182b7835cadd7b0b25f61a79abed241788f35a74d5937513f SHA512 02f9f574d2d06750ddf5218aaf3c725f954020bde94492264a9ad1d3294b24866f89d296b126ed26390f0597afb55daad944c31dde2bfedc6ea1ab769ea11c7d |
| 50 |
DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 73a78b4fa05aec86ed29315acdad8219957f3acae4ebca130ec17a578522443e8fe911a3165c3918eee12d6a0b8173c0d22166888ae392d8a83689494bdfe689 SHA512 841fcde4f8a0428e017b1f6fb70a2e4f9f7c5ee2ead410f48381f66815b9c2c23990b23ec06988a78aef01fbc4e624ceef05bd2eafd071d2174e998ba09a79a6 |
| 51 |
+DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac |
| 52 |
DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8 |
| 53 |
DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f |
| 54 |
|
| 55 |
diff --git a/app-editors/emacs/emacs-26.3-r12.ebuild b/app-editors/emacs/emacs-25.3-r16.ebuild |
| 56 |
similarity index 83% |
| 57 |
copy from app-editors/emacs/emacs-26.3-r12.ebuild |
| 58 |
copy to app-editors/emacs/emacs-25.3-r16.ebuild |
| 59 |
index 29c9491118fb..4d0361482612 100644 |
| 60 |
--- a/app-editors/emacs/emacs-26.3-r12.ebuild |
| 61 |
+++ b/app-editors/emacs/emacs-25.3-r16.ebuild |
| 62 |
@@ -8,14 +8,16 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 |
| 63 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 64 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 65 |
SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 66 |
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz" |
| 67 |
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz" |
| 68 |
|
| 69 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 70 |
-SLOT="26" |
| 71 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 72 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" |
| 73 |
+SLOT="25" |
| 74 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 75 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" |
| 76 |
|
| 77 |
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 78 |
+RDEPEND="acct-group/mail |
| 79 |
+ app-emacs/emacs-common[games?,gui(-)?] |
| 80 |
+ net-libs/liblockfile |
| 81 |
sys-libs/ncurses:0= |
| 82 |
acl? ( virtual/acl ) |
| 83 |
alsa? ( media-libs/alsa-lib ) |
| 84 |
@@ -24,13 +26,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 85 |
gpm? ( sys-libs/gpm ) |
| 86 |
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) |
| 87 |
kerberos? ( virtual/krb5 ) |
| 88 |
- lcms? ( media-libs/lcms:2 ) |
| 89 |
libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
| 90 |
- mailutils? ( net-mail/mailutils[clients] ) |
| 91 |
- !mailutils? ( acct-group/mail net-libs/liblockfile ) |
| 92 |
selinux? ( sys-libs/libselinux ) |
| 93 |
ssl? ( net-libs/gnutls:0= ) |
| 94 |
- systemd? ( sys-apps/systemd ) |
| 95 |
zlib? ( sys-libs/zlib ) |
| 96 |
gui? ( !aqua? ( |
| 97 |
x11-libs/libICE |
| 98 |
@@ -61,13 +59,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 99 |
>=dev-libs/m17n-lib-1.5.1 |
| 100 |
) |
| 101 |
) |
| 102 |
- gtk? ( |
| 103 |
- x11-libs/gtk+:3 |
| 104 |
- xwidgets? ( |
| 105 |
- net-libs/webkit-gtk:4.1= |
| 106 |
- x11-libs/libXcomposite |
| 107 |
- ) |
| 108 |
- ) |
| 109 |
+ gtk? ( x11-libs/gtk+:3 ) |
| 110 |
!gtk? ( |
| 111 |
motif? ( |
| 112 |
>=x11-libs/motif-2.3:0 |
| 113 |
@@ -113,9 +105,11 @@ src_prepare() { |
| 114 |
default |
| 115 |
|
| 116 |
# Fix filename reference in redirected man page |
| 117 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 118 |
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 119 |
+ || die "unable to sed ctags.1" |
| 120 |
|
| 121 |
AT_M4DIR=m4 eautoreconf |
| 122 |
+ touch src/stamp-h.in || die |
| 123 |
} |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
@@ -128,6 +122,9 @@ src_configure() { |
| 127 |
replace-flags "-O[3-9]" -O2 |
| 128 |
fi |
| 129 |
|
| 130 |
+ # Don't trigger a floating point exception for NaNs on alpha |
| 131 |
+ use alpha && append-flags -mieee |
| 132 |
+ |
| 133 |
local myconf |
| 134 |
|
| 135 |
if use alsa; then |
| 136 |
@@ -186,7 +183,8 @@ src_configure() { |
| 137 |
recommended that you compile Emacs with the Athena/Lucid or the |
| 138 |
Motif toolkit instead. |
| 139 |
EOF |
| 140 |
- myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
| 141 |
+ myconf+=" --with-x-toolkit=gtk3" |
| 142 |
+ myconf+=" --without-xwidgets" |
| 143 |
for f in motif Xaw3d athena; do |
| 144 |
use ${f} && ewarn \ |
| 145 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
| 146 |
@@ -205,33 +203,25 @@ src_configure() { |
| 147 |
einfo "Configuring to build with no toolkit" |
| 148 |
myconf+=" --with-x-toolkit=no" |
| 149 |
fi |
| 150 |
- ! use gtk && use xwidgets && ewarn \ |
| 151 |
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
| 152 |
fi |
| 153 |
|
| 154 |
econf \ |
| 155 |
--program-suffix="-${EMACS_SUFFIX}" \ |
| 156 |
- --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ |
| 157 |
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
| 158 |
--localstatedir="${EPREFIX}"/var \ |
| 159 |
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
| 160 |
+ --with-gameuser=":gamestat" \ |
| 161 |
--without-compress-install \ |
| 162 |
--without-hesiod \ |
| 163 |
- --without-pop \ |
| 164 |
--with-file-notification=$(usev inotify || usev gfile || echo no) \ |
| 165 |
$(use_enable acl) \ |
| 166 |
$(use_with dbus) \ |
| 167 |
$(use_with dynamic-loading modules) \ |
| 168 |
- $(use_with games gameuser ":gamestat") \ |
| 169 |
$(use_with gpm) \ |
| 170 |
$(use_with kerberos) $(use_with kerberos kerberos5) \ |
| 171 |
- $(use_with lcms lcms2) \ |
| 172 |
$(use_with libxml2 xml2) \ |
| 173 |
- $(use_with mailutils) \ |
| 174 |
$(use_with selinux) \ |
| 175 |
$(use_with ssl gnutls) \ |
| 176 |
- $(use_with systemd libsystemd) \ |
| 177 |
- $(use_with threads) \ |
| 178 |
$(use_with wide-int) \ |
| 179 |
$(use_with zlib) \ |
| 180 |
${myconf} |
| 181 |
@@ -245,25 +235,24 @@ src_compile() { |
| 182 |
src_install() { |
| 183 |
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install |
| 184 |
|
| 185 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die |
| 186 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die |
| 187 |
- mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die |
| 188 |
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
| 189 |
+ || die "moving emacs executable failed" |
| 190 |
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
| 191 |
+ || die "moving emacs man page failed" |
| 192 |
|
| 193 |
# move info dir to avoid collisions with the dir file generated by portage |
| 194 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die |
| 195 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
| 196 |
+ || die "moving info dir failed" |
| 197 |
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
| 198 |
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
| 199 |
|
| 200 |
# movemail must be setgid mail |
| 201 |
- if ! use mailutils; then |
| 202 |
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail |
| 203 |
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail |
| 204 |
- fi |
| 205 |
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail |
| 206 |
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail |
| 207 |
|
| 208 |
# avoid collision between slots, see bug #169033 e.g. |
| 209 |
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
| 210 |
- rm -rf "${ED}"/usr/share/{applications,icons} || die |
| 211 |
- rm -rf "${ED}/usr/$(get_libdir)" || die |
| 212 |
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die |
| 213 |
rm -rf "${ED}"/var || die |
| 214 |
|
| 215 |
# remove unused <version>/site-lisp dir |
| 216 |
@@ -272,15 +261,6 @@ src_install() { |
| 217 |
# remove COPYING file (except for etc/COPYING used by describe-copying) |
| 218 |
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die |
| 219 |
|
| 220 |
- if use systemd; then |
| 221 |
- insinto /usr/lib/systemd/user |
| 222 |
- sed -e "/^##/d" \ |
| 223 |
- -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ |
| 224 |
- -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ |
| 225 |
- etc/emacs.service | newins - ${EMACS_SUFFIX}.service |
| 226 |
- assert |
| 227 |
- fi |
| 228 |
- |
| 229 |
if use gzip-el; then |
| 230 |
# compress .el files when a corresponding .elc exists |
| 231 |
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
| 232 |
|
| 233 |
diff --git a/app-editors/emacs/emacs-26.3-r12.ebuild b/app-editors/emacs/emacs-26.3-r13.ebuild |
| 234 |
similarity index 99% |
| 235 |
rename from app-editors/emacs/emacs-26.3-r12.ebuild |
| 236 |
rename to app-editors/emacs/emacs-26.3-r13.ebuild |
| 237 |
index 29c9491118fb..e8b5949b9135 100644 |
| 238 |
--- a/app-editors/emacs/emacs-26.3-r12.ebuild |
| 239 |
+++ b/app-editors/emacs/emacs-26.3-r13.ebuild |
| 240 |
@@ -8,7 +8,7 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 |
| 241 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 242 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 243 |
SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 244 |
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz" |
| 245 |
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz" |
| 246 |
|
| 247 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 248 |
SLOT="26" |
| 249 |
|
| 250 |
diff --git a/app-editors/emacs/emacs-27.2-r10.ebuild b/app-editors/emacs/emacs-27.2-r11.ebuild |
| 251 |
similarity index 99% |
| 252 |
rename from app-editors/emacs/emacs-27.2-r10.ebuild |
| 253 |
rename to app-editors/emacs/emacs-27.2-r11.ebuild |
| 254 |
index be9e4f277203..c70e16d7d432 100644 |
| 255 |
--- a/app-editors/emacs/emacs-27.2-r10.ebuild |
| 256 |
+++ b/app-editors/emacs/emacs-27.2-r11.ebuild |
| 257 |
@@ -32,7 +32,7 @@ else |
| 258 |
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" |
| 259 |
fi |
| 260 |
# Patchset from proj/emacs-patches.git |
| 261 |
- SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz" |
| 262 |
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz" |
| 263 |
PATCHES=("${WORKDIR}/patch") |
| 264 |
SLOT="${PV%%.*}" |
| 265 |
[[ ${PV} == *.*.* ]] && SLOT+="-vcs" |
| 266 |
|
| 267 |
diff --git a/app-editors/emacs/emacs-28.2-r5.ebuild b/app-editors/emacs/emacs-28.2-r6.ebuild |
| 268 |
similarity index 99% |
| 269 |
rename from app-editors/emacs/emacs-28.2-r5.ebuild |
| 270 |
rename to app-editors/emacs/emacs-28.2-r6.ebuild |
| 271 |
index 6ffaf5fe8d0c..2a08c5f5e9ec 100644 |
| 272 |
--- a/app-editors/emacs/emacs-28.2-r5.ebuild |
| 273 |
+++ b/app-editors/emacs/emacs-28.2-r6.ebuild |
| 274 |
@@ -32,7 +32,7 @@ else |
| 275 |
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" |
| 276 |
fi |
| 277 |
# Patchset from proj/emacs-patches.git |
| 278 |
- SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz" |
| 279 |
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" |
| 280 |
PATCHES=("${WORKDIR}/patch") |
| 281 |
SLOT="${PV%%.*}" |
| 282 |
[[ ${PV} == *.*.* ]] && SLOT+="-vcs" |
Archives