* [gentoo-commits] repo/gentoo:master commit in: app-crypt/aescrypt/files/, app-crypt/aescrypt/
@ 2021-07-16 11:46 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2021-07-16 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 4cd20ef753adcbf7fae65db20d028c90b7e459bc
Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Wed Jul 14 09:05:03 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 11:46:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd20ef7
app-crypt/aescrypt: fix LDFLAGS in Makefile
Closes: https://bugs.gentoo.org/763660
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21633
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/aescrypt/aescrypt-3.14.ebuild | 5 ++++-
app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
index c40e124664a..51a5d8403d1 100644
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
@@ -18,7 +18,10 @@ RDEPEND="X? (
)
"
-PATCHES=( "${FILESDIR}/${P}-iconv.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-iconv.patch"
+ "${FILESDIR}/${P}-ldflags.patch"
+)
src_prepare() {
xdg_src_prepare
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
new file mode 100644
index 00000000000..757f0e4e7fc
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
@@ -0,0 +1,20 @@
+diff -Naru a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2021-07-14 09:25:15.509797042 +0200
++++ b/src/Makefile 2021-07-14 09:25:46.689797121 +0200
+@@ -27,13 +27,13 @@
+ all: aescrypt aescrypt_keygen
+
+ aescrypt: $(AESCRYPT_OBJS)
+- $(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
++ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
+
+ aescrypt_keygen: $(KEYGEN_OBJS)
+- $(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
++ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
+
+ %.o: %.c %.h
+- $(CC) $(CFLAGS) -c $*.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
+
+ install: aescrypt
+ install -o root -g root -m 755 aescrypt /usr/bin
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/aescrypt/files/, app-crypt/aescrypt/
@ 2024-08-31 15:44 Petr Vaněk
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vaněk @ 2024-08-31 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 916a07272b328c306a435ef04467e33dbe9c1dcd
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 15:33:15 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 15:33:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916a0727
app-crypt/aescrypt: drop 3.14
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-crypt/aescrypt/Manifest | 1 -
app-crypt/aescrypt/aescrypt-3.14.ebuild | 71 ----------------------
app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch | 40 ------------
.../aescrypt/files/aescrypt-3.14-ldflags.patch | 20 ------
4 files changed, 132 deletions(-)
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index b75e3dd1293c..0f211bfd2b8c 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,2 +1 @@
-DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
DIST aescrypt-3.16.tgz 39167 BLAKE2B 622976f55e33e98ede6488ee874d2f3371f928a8827d7973d967ddf253112eeb96036d2a7d4f8df7c1c9013e104d39fa5df9c28a7fce121cd11590a98e960c3a SHA512 b6d4fda92bb465c36a9930de0d86777111d2da67f2aa274fb98fcd99629c7ff2d88d8faffdbeeae25c44dc99f0f29b2872867128b7e3a384deada744ce21cdd0
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
deleted file mode 100644
index 51a5d8403d18..000000000000
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic desktop xdg
-
-DESCRIPTION="Advanced file encryption using AES"
-HOMEPAGE="https://www.aescrypt.com/"
-SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="static X"
-RDEPEND="X? (
- || ( gnome-extra/zenity kde-apps/kdialog )
- dev-lang/perl
- )
- "
-
-PATCHES=(
- "${FILESDIR}/${P}-iconv.patch"
- "${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
- xdg_src_prepare
- sed -i \
- -e 's:Icon=/usr/share/aescrypt/SmallLock.png:Icon=SmallLock:' \
- -e 's|Categories=Application;Utility;TextEditor;|Categories=Utility;TextEditor;|' \
- gui/AESCrypt.desktop || die
-}
-
-src_compile() {
- if use static; then
- append-cflags "-DDISABLE_ICONV"
- append-ldflags "-static"
- fi
- cd src || die
- emake \
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-src_test() {
- cd src || die
- emake -j1 test \
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin src/{aescrypt,aescrypt_keygen}
- doman man/*
- doicon gui/SmallLock.png
- domenu gui/AESCrypt.desktop
- dobin gui/aescrypt-gui
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- if use X; then
- einfo 'The .desktop file for aescrypt is only supposed to be used with "Open With"'
- einfo 'to encrypt and decrypt files.'
- einfo 'See:'
- einfo ' https://www.aescrypt.com/linux_aes_crypt.html'
- einfo 'for more information'
- fi
-}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
deleted file mode 100644
index 8232f80aebbc..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:18:08 +0200
-Subject: [PATCH 2/2] build: support disable iconv for static build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- password.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/password.c b/password.c
-index 9a2c1f8..dee79da 100644
---- a/src/password.c
-+++ b/src/password.c
-@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
- size_t ic_inbytesleft,
- ic_outbytesleft;
-
-+#ifdef DISABLE_ICONV
-+ /* support only latin */
-+ int i;
-+ for (i=0;i<length+1;i++) {
-+ out_passwd[i*2] = in_passwd[i];
-+ out_passwd[i*2+1] = 0;
-+ }
-+ return length*2;
-+#else
- /* Max length is specified in character, but this function deals
- * with bytes. So, multiply by two since we are going to create a
- * UTF-16 string.
-@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
- }
- iconv_close(condesc);
- return (max_length - ic_outbytesleft);
-+#endif
- }
-
---
-1.7.12.4
-
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
deleted file mode 100644
index 757f0e4e7fcb..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naru a/src/Makefile b/src/Makefile
---- a/src/Makefile 2021-07-14 09:25:15.509797042 +0200
-+++ b/src/Makefile 2021-07-14 09:25:46.689797121 +0200
-@@ -27,13 +27,13 @@
- all: aescrypt aescrypt_keygen
-
- aescrypt: $(AESCRYPT_OBJS)
-- $(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
-+ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
-
- aescrypt_keygen: $(KEYGEN_OBJS)
-- $(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
-+ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
-
- %.o: %.c %.h
-- $(CC) $(CFLAGS) -c $*.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
-
- install: aescrypt
- install -o root -g root -m 755 aescrypt /usr/bin
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-31 15:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-16 11:46 [gentoo-commits] repo/gentoo:master commit in: app-crypt/aescrypt/files/, app-crypt/aescrypt/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-08-31 15:44 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox