wok-next rev 20794
gnupg: fix absence of /usr/bin/gpg and /usr/bin/gpgv; tiny edits
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jun 10 13:10:07 2018 +0300 (2018-06-10) |
| parents | b15beafb58c2 |
| children | 578b3cb5cca4 |
| files | cookutils/receipt gnupg/receipt gpa/receipt gpa/stuff/gpa-0.9.0-libassuan2.patch gpgme/receipt libksba/receipt libsecret/receipt pinentry-gtk/description.txt pinentry-gtk/receipt pinentry/receipt |
line diff
1.1 --- a/cookutils/receipt Sun Jun 10 02:36:11 2018 +0300 1.2 +++ b/cookutils/receipt Sun Jun 10 13:10:07 2018 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="cookutils" 1.7 -VERSION="1072" 1.8 +VERSION="1073" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="SliTaz packages builder new generation" 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/gnupg/receipt Sun Jun 10 02:36:11 2018 +0300 2.2 +++ b/gnupg/receipt Sun Jun 10 13:10:07 2018 +0300 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="gnupg" 2.8 VERSION="2.2.8" 2.9 @@ -7,44 +7,47 @@ 2.10 MAINTAINER="pankso@slitaz.org" 2.11 LICENSE="GPL3" 2.12 WEB_SITE="https://www.gnupg.org/" 2.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/gnupg.html" 2.14 2.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.16 WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnupg/$TARBALL" 2.17 -# https://www.gnupg.org/download/integrity_check.html 2.18 +# https://www.gnupg.org/download/integrity_check.html 2.19 TARBALL_SHA1="d87553a125832ea90e8aeb3ceeecf24f88de56fb" 2.20 2.21 BUILD_DEPENDS="libgpg-error-dev libassuan-dev libgcrypt-dev libksba-dev \ 2.22 -npth-dev perl libusb-dev sqlite3-dev gettext zlib-dev readline-dev texinfo gnutls-dev openldap-dev" 2.23 +npth-dev perl libusb-dev sqlite3-dev gettext zlib-dev bzip2-dev readline-dev \ 2.24 +texinfo gnutls-dev openldap-dev" 2.25 2.26 -# Rules to configure and make the package. 2.27 -compile_rules() 2.28 -{ 2.29 +compile_rules() { 2.30 ./configure \ 2.31 --enable-symcryptrun \ 2.32 --enable-maintainer-mode \ 2.33 - --docdir=/usr/share/doc/gnupg-$VERSION \ 2.34 $CONFIGURE_ARGS && 2.35 - make && make install && 2.36 - 2.37 + make && 2.38 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi && 2.39 makeinfo --plaintext -o doc/gnupg.txt doc/gnupg.texi && 2.40 + make install || return 1 2.41 2.42 - docdir="$install/usr/share/doc/gnupg-$VERSION" && 2.43 - install -v -m755 -d $docdir/html && 2.44 - install -v -m644 doc/gnupg_nochunks.html $docdir/html/gnupg.html && 2.45 - install -v -m644 doc/*.texi doc/gnupg.txt $docdir && 2.46 + # FIXME. 2.47 + # Looks like functions install-exec-hook() from g10/Makefile work in 2.48 + # an unexpected manner. It required to spend too many time in debugging, so 2.49 + # better I'll apply here "fast and dirty hack" that will make the same: 2.50 + install -m755 g10/gpg $install/usr/bin/gpg2 2.51 + install -m755 g10/gpgv $install/usr/bin/gpgv2 2.52 + # The same "hack" for doc/Makefile 2.53 + cook_pick_manpages doc/gpg.1 doc/gpgv.1 2.54 2.55 - for f in gpg gpgv; do 2.56 - ln -svf ${f}2.1 $install/usr/share/man/man1/$f.1 && 2.57 - ln -svf ${f}2 $install/usr/bin/$f 2.58 - done 2.59 - unset f 2.60 + docdir="$install/usr/share/doc/gnupg-$VERSION" 2.61 + install -v -m755 -d $docdir/html 2.62 + install -v -m644 doc/gnupg_nochunks.html $docdir/html/gnupg.html 2.63 + install -v -m644 doc/*.texi doc/gnupg.txt $docdir 2.64 + 2.65 + ln -svf gpg2 $install/usr/bin/gpg 2.66 + ln -svf gpgv2 $install/usr/bin/gpgv 2.67 } 2.68 2.69 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.70 -genpkg_rules() 2.71 -{ 2.72 +genpkg_rules() { 2.73 copy @std 2.74 - DEPENDS="libassuan libgcrypt libgpg-error libksba libsqlite3 libusb ncurses \ 2.75 - npth readline zlib bzlib pinentry gnutls libldap" 2.76 + DEPENDS="bzlib libassuan libgcrypt libgnutls libgpg-error libksba libldap \ 2.77 + libsqlite3 libusb npth readline zlib pinentry" 2.78 }
3.1 --- a/gpa/receipt Sun Jun 10 02:36:11 2018 +0300 3.2 +++ b/gpa/receipt Sun Jun 10 13:10:07 2018 +0300 3.3 @@ -10,28 +10,27 @@ 3.4 3.5 TARBALL="$PACKAGE-$VERSION.tar.bz2" 3.6 WGET_URL="https://www.gnupg.org/ftp/gcrypt/gpa/$TARBALL" 3.7 -# Integrity check: https://www.gnupg.org/download/integrity_check.html 3.8 +# Integrity check: https://www.gnupg.org/download/integrity_check.html 3.9 TARBALL_SHA1="c629348725c1bf5dafd57f8a70187dc89815ce60" 3.10 3.11 BUILD_DEPENDS="gtk+-dev libgpg-error-dev libassuan-dev gpgme-dev" 3.12 SPLIT="gpa-langpack" 3.13 3.14 compile_rules() { 3.15 - ./configure $CONFIGURE_ARGS && make && make install || return 1 3.16 - 3.17 - find $install/usr/share/man -type f -exec gzip -9 \{\} \; 3.18 + ./configure $CONFIGURE_ARGS && 3.19 + make && 3.20 + make install 3.21 } 3.22 3.23 genpkg_rules() { 3.24 case $PACKAGE in 3.25 gpa) 3.26 - cp -a $install/* $fs 3.27 - rm -r $fs/usr/share/locale 3.28 - DEPENDS="gpgme gtk+ pinentry-gtk" 3.29 + copy @std 3.30 + DEPENDS="gdk-pixbuf glib gpgme gtk+ libassuan libgpg-error zlib \ 3.31 + pinentry-gtk" 3.32 ;; 3.33 gpa-langpack) 3.34 - mkdir -p $fs/usr/share 3.35 - cp -a $install/usr/share/locale $fs/usr/share 3.36 + copy *.mo 3.37 CAT="localization|locale files" 3.38 ;; 3.39 esac
4.1 --- a/gpa/stuff/gpa-0.9.0-libassuan2.patch Sun Jun 10 02:36:11 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,389 +0,0 @@ 4.4 -Index: src/server.c 4.5 -=================================================================== 4.6 ---- src/server.c.orig 2009-05-13 09:11:11.000000000 +0200 4.7 -+++ src/server.c 2010-04-08 08:13:27.000000000 +0200 4.8 -@@ -568,7 +568,7 @@ prepare_io_streams (assuan_context_t ctx 4.9 - the last command. A RESET command undoes the effect of this 4.10 - command. 4.11 - */ 4.12 --static int 4.13 -+static gpg_error_t 4.14 - cmd_session (assuan_context_t ctx, char *line) 4.15 - { 4.16 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.17 -@@ -594,7 +594,7 @@ cmd_session (assuan_context_t ctx, char 4.18 - validity right away; if it does not (as here) all recipients are 4.19 - checked at the time of the ENCRYPT command. All RECIPIENT commands 4.20 - are cumulative until a RESET or an successful ENCRYPT command. */ 4.21 --static int 4.22 -+static gpg_error_t 4.23 - cmd_recipient (assuan_context_t ctx, char *line) 4.24 - { 4.25 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.26 -@@ -615,7 +615,7 @@ cmd_recipient (assuan_context_t ctx, cha 4.27 - Set the file descriptor to read a message which is used with 4.28 - detached signatures. 4.29 - */ 4.30 --static int 4.31 -+static gpg_error_t 4.32 - cmd_message (assuan_context_t ctx, char *line) 4.33 - { 4.34 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.35 -@@ -659,7 +659,7 @@ cont_encrypt (assuan_context_t ctx, gpg_ 4.36 - 4.37 - Encrypt the data received on INPUT to OUTPUT. 4.38 - */ 4.39 --static int 4.40 -+static gpg_error_t 4.41 - cmd_encrypt (assuan_context_t ctx, char *line) 4.42 - { 4.43 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.44 -@@ -755,7 +755,7 @@ cont_prep_encrypt (assuan_context_t ctx, 4.45 - 4.46 - Dummy encryption command used to check whether the given recipients 4.47 - are all valid and to tell the client the preferred protocol. */ 4.48 --static int 4.49 -+static gpg_error_t 4.50 - cmd_prep_encrypt (assuan_context_t ctx, char *line) 4.51 - { 4.52 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.53 -@@ -814,7 +814,7 @@ cmd_prep_encrypt (assuan_context_t ctx, 4.54 - @code{RESET} command. A second command overrides the effect of 4.55 - the first one; if EMAIL is not given the server shall use the 4.56 - default signing key. */ 4.57 --static int 4.58 -+static gpg_error_t 4.59 - cmd_sender (assuan_context_t ctx, char *line) 4.60 - { 4.61 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.62 -@@ -867,7 +867,7 @@ cont_sign (assuan_context_t ctx, gpg_err 4.63 - 4.64 - Sign the data received on INPUT to OUTPUT. 4.65 - */ 4.66 --static int 4.67 -+static gpg_error_t 4.68 - cmd_sign (assuan_context_t ctx, char *line) 4.69 - { 4.70 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.71 -@@ -943,7 +943,7 @@ cont_decrypt (assuan_context_t ctx, gpg_ 4.72 - If the option --no-verify is given, the server should not try to 4.73 - verify a signature, in case the input data is an OpenPGP combined 4.74 - message. */ 4.75 --static int 4.76 -+static gpg_error_t 4.77 - cmd_decrypt (assuan_context_t ctx, char *line) 4.78 - { 4.79 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.80 -@@ -1058,7 +1058,7 @@ cont_verify (assuan_context_t ctx, gpg_e 4.81 - 4.82 - The DISPLAYSTRING is a percent-and-plus-encoded string with a short 4.83 - human readable description of the status. */ 4.84 --static int 4.85 -+static gpg_error_t 4.86 - cmd_verify (assuan_context_t ctx, char *line) 4.87 - { 4.88 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.89 -@@ -1143,7 +1143,7 @@ cmd_verify (assuan_context_t ctx, char * 4.90 - manager is brought into the foregound and that this command 4.91 - immediatley returns. 4.92 - */ 4.93 --static int 4.94 -+static gpg_error_t 4.95 - cmd_start_keymanager (assuan_context_t ctx, char *line) 4.96 - { 4.97 - gpa_open_key_manager (NULL, NULL); 4.98 -@@ -1157,7 +1157,7 @@ cmd_start_keymanager (assuan_context_t c 4.99 - manager is brought into the foregound and that this command 4.100 - immediatley returns. 4.101 - */ 4.102 --static int 4.103 -+static gpg_error_t 4.104 - cmd_start_cardmanager (assuan_context_t ctx, char *line) 4.105 - { 4.106 - gpa_open_cardmanager (NULL, NULL); 4.107 -@@ -1172,7 +1172,7 @@ cmd_start_cardmanager (assuan_context_t 4.108 - manager is brought into the foregound and that this command 4.109 - immediatley returns. 4.110 - */ 4.111 --static int 4.112 -+static gpg_error_t 4.113 - cmd_start_confdialog (assuan_context_t ctx, char *line) 4.114 - { 4.115 - gpa_open_settings_dialog (NULL, NULL); 4.116 -@@ -1191,7 +1191,7 @@ cmd_start_confdialog (assuan_context_t c 4.117 - version - Return the version of the program. 4.118 - pid - Return the process id of the server. 4.119 - */ 4.120 --static int 4.121 -+static gpg_error_t 4.122 - cmd_getinfo (assuan_context_t ctx, char *line) 4.123 - { 4.124 - gpg_error_t err; 4.125 -@@ -1295,7 +1295,7 @@ decode_percent_string (char *str) 4.126 - 4.127 - Set the files on which to operate. 4.128 - */ 4.129 --static int 4.130 -+static gpg_error_t 4.131 - cmd_file (assuan_context_t ctx, char *line) 4.132 - { 4.133 - gpg_error_t err = 0; 4.134 -@@ -1366,7 +1366,7 @@ impl_encrypt_sign_files (assuan_context_ 4.135 - 4.136 - 4.137 - /* ENCRYPT_FILES --nohup */ 4.138 --static int 4.139 -+static gpg_error_t 4.140 - cmd_encrypt_files (assuan_context_t ctx, char *line) 4.141 - { 4.142 - gpg_error_t err; 4.143 -@@ -1389,7 +1389,7 @@ cmd_encrypt_files (assuan_context_t ctx, 4.144 - 4.145 - 4.146 - /* SIGN_FILES --nohup */ 4.147 --static int 4.148 -+static gpg_error_t 4.149 - cmd_sign_files (assuan_context_t ctx, char *line) 4.150 - { 4.151 - gpg_error_t err; 4.152 -@@ -1412,7 +1412,7 @@ cmd_sign_files (assuan_context_t ctx, ch 4.153 - 4.154 - 4.155 - /* ENCRYPT_SIGN_FILES --nohup */ 4.156 --static int 4.157 -+static gpg_error_t 4.158 - cmd_encrypt_sign_files (assuan_context_t ctx, char *line) 4.159 - { 4.160 - gpg_error_t err; 4.161 -@@ -1474,7 +1474,7 @@ impl_decrypt_verify_files (assuan_contex 4.162 - 4.163 - 4.164 - /* DECRYPT_FILES --nohup */ 4.165 --static int 4.166 -+static gpg_error_t 4.167 - cmd_decrypt_files (assuan_context_t ctx, char *line) 4.168 - { 4.169 - gpg_error_t err; 4.170 -@@ -1497,7 +1497,7 @@ cmd_decrypt_files (assuan_context_t ctx, 4.171 - 4.172 - 4.173 - /* VERIFY_FILES --nohup */ 4.174 --static int 4.175 -+static gpg_error_t 4.176 - cmd_verify_files (assuan_context_t ctx, char *line) 4.177 - { 4.178 - gpg_error_t err; 4.179 -@@ -1520,7 +1520,7 @@ cmd_verify_files (assuan_context_t ctx, 4.180 - 4.181 - 4.182 - /* DECRYPT_VERIFY_FILES --nohup */ 4.183 --static int 4.184 -+static gpg_error_t 4.185 - cmd_decrypt_verify_files (assuan_context_t ctx, char *line) 4.186 - { 4.187 - gpg_error_t err; 4.188 -@@ -1543,7 +1543,7 @@ cmd_decrypt_verify_files (assuan_context 4.189 - 4.190 - 4.191 - /* IMPORT_FILES --nohup */ 4.192 --static int 4.193 -+static gpg_error_t 4.194 - cmd_import_files (assuan_context_t ctx, char *line) 4.195 - { 4.196 - gpg_error_t err; 4.197 -@@ -1567,7 +1567,7 @@ cmd_import_files (assuan_context_t ctx, 4.198 - 4.199 - 4.200 - /* CHECKSUM_CREATE_FILES --nohup */ 4.201 --static int 4.202 -+static gpg_error_t 4.203 - cmd_checksum_create_files (assuan_context_t ctx, char *line) 4.204 - { 4.205 - gpg_error_t err; 4.206 -@@ -1591,7 +1591,7 @@ cmd_checksum_create_files (assuan_contex 4.207 - 4.208 - 4.209 - /* CHECKSUM_VERIFY_FILES --nohup */ 4.210 --static int 4.211 -+static gpg_error_t 4.212 - cmd_checksum_verify_files (assuan_context_t ctx, char *line) 4.213 - { 4.214 - gpg_error_t err; 4.215 -@@ -1614,8 +1614,8 @@ cmd_checksum_verify_files (assuan_contex 4.216 - } 4.217 - 4.218 - 4.219 --static void 4.220 --reset_notify (assuan_context_t ctx) 4.221 -+static gpg_error_t 4.222 -+reset_notify (assuan_context_t ctx, char *line) 4.223 - { 4.224 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.225 - 4.226 -@@ -1639,6 +1639,7 @@ reset_notify (assuan_context_t ctx) 4.227 - ctrl->session_number = 0; 4.228 - xfree (ctrl->session_title); 4.229 - ctrl->session_title = NULL; 4.230 -+ return 0; 4.231 - } 4.232 - 4.233 - 4.234 -@@ -1648,7 +1649,7 @@ register_commands (assuan_context_t ctx) 4.235 - { 4.236 - static struct { 4.237 - const char *name; 4.238 -- int (*handler)(assuan_context_t, char *line); 4.239 -+ assuan_handler_t handler; 4.240 - } table[] = { 4.241 - { "SESSION", cmd_session }, 4.242 - { "RECIPIENT", cmd_recipient }, 4.243 -@@ -1681,7 +1682,8 @@ register_commands (assuan_context_t ctx) 4.244 - 4.245 - for (i=0; table[i].name; i++) 4.246 - { 4.247 -- rc = assuan_register_command (ctx, table[i].name, table[i].handler); 4.248 -+ rc = assuan_register_command (ctx, table[i].name, table[i].handler, 4.249 -+ NULL); 4.250 - if (rc) 4.251 - return rc; 4.252 - } 4.253 -@@ -1692,7 +1694,7 @@ register_commands (assuan_context_t ctx) 4.254 - 4.255 - /* Prepare for a new connection on descriptor FD. */ 4.256 - static assuan_context_t 4.257 --connection_startup (int fd) 4.258 -+connection_startup (assuan_fd_t fd) 4.259 - { 4.260 - gpg_error_t err; 4.261 - assuan_context_t ctx; 4.262 -@@ -1700,7 +1702,16 @@ connection_startup (int fd) 4.263 - 4.264 - /* Get an Assuan context for the already accepted file descriptor 4.265 - FD. Allow descriptor passing. */ 4.266 -- err = assuan_init_socket_server_ext (&ctx, ASSUAN_INT2FD(fd), 1|2); 4.267 -+ err = assuan_new (&ctx); 4.268 -+ if (err) 4.269 -+ { 4.270 -+ g_debug ("failed to initialize the new connection: %s", 4.271 -+ gpg_strerror (err)); 4.272 -+ return NULL; 4.273 -+ } 4.274 -+ 4.275 -+ err = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_FDPASSING 4.276 -+ | ASSUAN_SOCKET_SERVER_ACCEPTED); 4.277 - if (err) 4.278 - { 4.279 - g_debug ("failed to initialize the new connection: %s", 4.280 -@@ -1712,7 +1723,7 @@ connection_startup (int fd) 4.281 - { 4.282 - g_debug ("failed to register commands with Assuan: %s", 4.283 - gpg_strerror (err)); 4.284 -- assuan_deinit_server (ctx); 4.285 -+ assuan_release (ctx); 4.286 - return NULL; 4.287 - } 4.288 - 4.289 -@@ -1736,8 +1747,8 @@ connection_finish (assuan_context_t ctx) 4.290 - { 4.291 - conn_ctrl_t ctrl = assuan_get_pointer (ctx); 4.292 - 4.293 -- reset_notify (ctx); 4.294 -- assuan_deinit_server (ctx); 4.295 -+ reset_notify (ctx, NULL); 4.296 -+ assuan_release (ctx); 4.297 - g_free (ctrl); 4.298 - connection_counter--; 4.299 - if (!connection_counter && shutdown_pending) 4.300 -@@ -1805,14 +1816,23 @@ receive_cb (GIOChannel *channel, GIOCond 4.301 - } 4.302 - else 4.303 - { 4.304 -+ int done = 0; 4.305 - ctrl->in_command++; 4.306 -- err = assuan_process_next (ctx); 4.307 -+ err = assuan_process_next (ctx, &done); 4.308 - ctrl->in_command--; 4.309 -+ if (err) 4.310 -+ { 4.311 -+ g_debug ("assuan_process_next returned: %s <%s>", 4.312 -+ gpg_strerror (err), gpg_strsource (err)); 4.313 -+ } 4.314 -+ else 4.315 -+ { 4.316 - g_debug ("assuan_process_next returned: %s", 4.317 -- err == -1? "EOF": gpg_strerror (err)); 4.318 -+ done ? "done" : "success"); 4.319 -+ } 4.320 - if (gpg_err_code (err) == GPG_ERR_EAGAIN) 4.321 - ; /* Ignore. */ 4.322 -- else if (gpg_err_code (err) == GPG_ERR_EOF || err == -1) 4.323 -+ else if (!err && done) 4.324 - { 4.325 - if (ctrl->cont_cmd) 4.326 - ctrl->client_died = 1; /* Need to delay the cleanup. */ 4.327 -@@ -1868,14 +1888,14 @@ accept_connection_cb (GIOChannel *listen 4.328 - g_debug ("error accepting connection: %s", strerror (errno)); 4.329 - goto leave; 4.330 - } 4.331 -- if (assuan_sock_check_nonce (ASSUAN_INT2FD(fd), &socket_nonce)) 4.332 -+ if (assuan_sock_check_nonce ((assuan_fd_t) fd, &socket_nonce)) 4.333 - { 4.334 - g_debug ("new connection at fd %d refused", fd); 4.335 - goto leave; 4.336 - } 4.337 - 4.338 - g_debug ("new connection at fd %d", fd); 4.339 -- ctx = connection_startup (fd); 4.340 -+ ctx = connection_startup ((assuan_fd_t) fd); 4.341 - if (!ctx) 4.342 - goto leave; 4.343 - 4.344 -@@ -1911,7 +1931,7 @@ accept_connection_cb (GIOChannel *listen 4.345 - 4.346 - leave: 4.347 - if (fd != -1) 4.348 -- assuan_sock_close (ASSUAN_INT2FD (fd)); 4.349 -+ assuan_sock_close ((assuan_fd_t) fd); 4.350 - return TRUE; /* Keep the listen_fd in the event loop. */ 4.351 - } 4.352 - 4.353 -@@ -1929,7 +1949,7 @@ gpa_start_server (void) 4.354 - GIOChannel *channel; 4.355 - unsigned int source_id; 4.356 - 4.357 -- assuan_set_assuan_err_source (GPG_ERR_SOURCE_DEFAULT); 4.358 -+ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); 4.359 - 4.360 - socket_name = g_build_filename (gnupg_homedir, "S.uiserver", NULL); 4.361 - if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path ) 4.362 -@@ -1974,14 +1994,14 @@ gpa_start_server (void) 4.363 - g_free (socket_name); 4.364 - socket_name = NULL; 4.365 - 4.366 -- if (listen (ASSUAN_FD2INT (fd), 5) == -1) 4.367 -+ if (listen ((int) fd, 5) == -1) 4.368 - { 4.369 - g_debug ("listen() failed: %s\n", strerror (errno)); 4.370 - assuan_sock_close (fd); 4.371 - return; 4.372 - } 4.373 - #ifdef HAVE_W32_SYSTEM 4.374 -- channel = g_io_channel_win32_new_socket (ASSUAN_FD2INT(fd)); 4.375 -+ channel = g_io_channel_win32_new_socket ((int) fd); 4.376 - #else 4.377 - channel = g_io_channel_unix_new (fd); 4.378 - #endif 4.379 -Index: configure.ac 4.380 -=================================================================== 4.381 ---- configure.ac.orig 2009-06-20 00:05:29.000000000 +0200 4.382 -+++ configure.ac 2010-04-08 08:13:27.000000000 +0200 4.383 -@@ -37,8 +37,8 @@ AC_INIT([gpa], 4.384 - [bug-gpa@gnupg.org]) 4.385 - 4.386 - NEED_GPG_ERROR_VERSION=1.4 4.387 --NEED_LIBASSUAN_API=1 4.388 --NEED_LIBASSUAN_VERSION=1.0.4 4.389 -+NEED_LIBASSUAN_API=2 4.390 -+NEED_LIBASSUAN_VERSION=1.1.0 4.391 - NEED_GPGME_API=1 4.392 - NEED_GPGME_VERSION=1.2.0
5.1 --- a/gpgme/receipt Sun Jun 10 02:36:11 2018 +0300 5.2 +++ b/gpgme/receipt Sun Jun 10 13:10:07 2018 +0300 5.3 @@ -29,11 +29,10 @@ 5.4 gpgme) 5.5 copy @std 5.6 rm -r $fs/usr/share 5.7 - DEPENDS="libassuan libgpg-error gnupg" 5.8 + DEPENDS="libassuan libgpg-error gnupg" 5.9 ;; 5.10 *-dev) 5.11 copy @dev common-lisp/ 5.12 - DEPENDS="gpgme libassuan-dev libgpg-error-dev gnupg" 5.13 ;; 5.14 esac 5.15 }
6.1 --- a/libksba/receipt Sun Jun 10 02:36:11 2018 +0300 6.2 +++ b/libksba/receipt Sun Jun 10 13:10:07 2018 +0300 6.3 @@ -11,6 +11,7 @@ 6.4 6.5 TARBALL="$PACKAGE-$VERSION.tar.bz2" 6.6 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libksba/$TARBALL" 6.7 +# https://www.gnupg.org/download/integrity_check.html 6.8 TARBALL_SHA1="a98385734a0c3f5b713198e8d6e6e4aeb0b76fde" 6.9 6.10 BUILD_DEPENDS="libgpg-error-dev"
7.1 --- a/libsecret/receipt Sun Jun 10 02:36:11 2018 +0300 7.2 +++ b/libsecret/receipt Sun Jun 10 13:10:07 2018 +0300 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="libsecret" 7.7 -VERSION="0.18.5" 7.8 +VERSION="0.18.6" 7.9 CATEGORY="security" 7.10 SHORT_DESC="GObject bindings for Secret Service API" 7.11 MAINTAINER="devl547@gmail.com"
8.1 --- a/pinentry-gtk/description.txt Sun Jun 10 02:36:11 2018 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,10 +0,0 @@ 8.4 -This is a collection of simple PIN or passphrase entry dialogs which utilize 8.5 -the Assuan protocol as described by the aegypten project; see 8.6 -http://www.gnupg.org/aegypten/ for details. 8.7 - 8.8 -There are programs for different toolkits available. This package contains 8.9 -program for GTK+ V2.0. The GTK+ and Qt pinentries can fall back to curses mode. 8.10 - 8.11 -Some of the code is taken from Robert Bihlmeyer's Quintuple-Agent. For security 8.12 -reasons, all internationalization has been removed. The client is expected to 8.13 -tell the PIN entry the text strings to be displayed.
9.1 --- a/pinentry-gtk/receipt Sun Jun 10 02:36:11 2018 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,38 +0,0 @@ 9.4 -# SliTaz package receipt. 9.5 - 9.6 -PACKAGE="pinentry-gtk" 9.7 -VERSION="1.1.0" 9.8 -CATEGORY="security" 9.9 -SHORT_DESC="Allow GnuPG to read passphrases and PIN numbers in a secure manner (GTK+ GUI)." 9.10 -MAINTAINER="pascal.bellard@slitaz.org" 9.11 -LICENSE="GPL2" 9.12 -WEB_SITE="https://www.gnupg.org/" 9.13 -TARBALL="pinentry-$VERSION.tar.bz2" 9.14 -WGET_URL="https://www.gnupg.org/ftp/gcrypt/pinentry/$TARBALL" 9.15 - 9.16 -DEPENDS="gtk+ libassuan libcap libsecret ncurses" 9.17 -BUILD_DEPENDS="libgpg-error-dev libassuan-dev libsecret-dev ncurses-dev \ 9.18 -libcap-dev gtk+-dev libgcrypt-dev fltk-dev" 9.19 -SIBLINGS="pinentry" 9.20 - 9.21 -# Rules to gen a SliTaz package suitable for Tazpkg. 9.22 - 9.23 -compile_rules() 9.24 -{ 9.25 - # Integrity check: https://www.gnupg.org/download/integrity_check.html 9.26 - echo "693bdf9f48dfb3e040d92f50b1bb464e268b9fb0 $SRC/$TARBALL" | sha1sum -c || exit 1 9.27 - 9.28 - ./configure \ 9.29 - --enable-pinentry-gtk2 \ 9.30 - --enable-fallback-curses \ 9.31 - --disable-pinentry-curses \ 9.32 - $CONFIGURE_ARGS && 9.33 - make && 9.34 - make install 9.35 -} 9.36 - 9.37 -genpkg_rules() 9.38 -{ 9.39 - mkdir -p $fs/usr/ 9.40 - cp -a $install/usr/bin $fs/usr 9.41 -}
10.1 --- a/pinentry/receipt Sun Jun 10 02:36:11 2018 +0300 10.2 +++ b/pinentry/receipt Sun Jun 10 13:10:07 2018 +0300 10.3 @@ -3,8 +3,7 @@ 10.4 PACKAGE="pinentry" 10.5 VERSION="1.1.0" 10.6 CATEGORY="security" 10.7 -SHORT_DESC="Collection of dialog programs that allow GnuPG to read passphrases \ 10.8 -and PIN numbers in a secure manner" 10.9 +SHORT_DESC="Allow GnuPG to read passphrases and PIN numbers in a secure manner" 10.10 MAINTAINER="pascal.bellard@slitaz.org" 10.11 LICENSE="GPL2" 10.12 WEB_SITE="https://www.gnupg.org/" 10.13 @@ -16,18 +15,51 @@ 10.14 TARBALL_SHA1="693bdf9f48dfb3e040d92f50b1bb464e268b9fb0" 10.15 10.16 BUILD_DEPENDS="libassuan-dev libgpg-error-dev ncurses-dev libcap-dev \ 10.17 -libsecret-dev libgcrypt-dev fltk-dev" # gtk+-dev gcr-dev 10.18 -SIBLINGS="pinentry-gtk" 10.19 +libsecret-dev libgcrypt-dev shared-mime-info gtk+-dev gtk+3-dev gcr-dev \ 10.20 +fltk-dev" 10.21 +SPLIT="pinentry-gtk pinentry-gnome3 pinentry-fltk" 10.22 10.23 compile_rules() { 10.24 ./configure \ 10.25 + --enable-pinentry-curses \ 10.26 + --enable-fallback-curses \ 10.27 --enable-pinentry-tty \ 10.28 + --enable-pinentry-gtk2 \ 10.29 + --enable-pinentry-gnome3 \ 10.30 + --disable-pinentry-qt \ 10.31 + --enable-pinentry-fltk \ 10.32 $CONFIGURE_ARGS && 10.33 make && 10.34 - make install 10.35 + make install || return 1 10.36 + 10.37 + # make default pinentry the pinentry-curses 10.38 + ln -sf pinentry-curses $install/usr/bin/pinentry 10.39 } 10.40 10.41 genpkg_rules() { 10.42 - copy @std 10.43 - DEPENDS="glib libassuan libcap libgpg-error libsecret ncurses" 10.44 + case $PACKAGE in 10.45 + pinentry) 10.46 + copy pinentry-tty pinentry-curses pinentry 10.47 + DEPENDS="glib libassuan libcap libgpg-error libsecret ncurses" 10.48 + CAT="security|for console" 10.49 + ;; 10.50 + pinentry-gtk) 10.51 + copy pinentry-gtk-2 10.52 + DEPENDS="glib gtk+ libassuan libcap libgpg-error libsecret \ 10.53 + ncurses pinentry" 10.54 + CAT="security|for GTK+ 2" 10.55 + ;; 10.56 + pinentry-gnome3) 10.57 + copy pinentry-gnome3 10.58 + DEPENDS="gcr-base glib libassuan libcap libgpg-error libsecret \ 10.59 + ncurses pinentry" 10.60 + CAT="security|for GNOME 3" 10.61 + ;; 10.62 + pinentry-fltk) 10.63 + copy pinentry-fltk 10.64 + DEPENDS="fltk glib libassuan libcap libgpg-error libsecret \ 10.65 + ncurses pinentry" 10.66 + CAT="security|for FLTK" 10.67 + ;; 10.68 + esac 10.69 }