wok rev 9186
Automated merge with http://hg.slitaz.org/wok
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Wed Mar 09 05:02:28 2011 +0100 (2011-03-09) |
| parents | e3caaec13bfb 08e79d7c5e4b |
| children | 2765df2990a9 |
| files |
line diff
1.1 --- a/gpa-langpack/receipt Tue Mar 08 22:59:18 2011 +0000 1.2 +++ b/gpa-langpack/receipt Wed Mar 09 05:02:28 2011 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="gpa-langpack" 1.7 -VERSION="0.7.5" 1.8 +VERSION="0.9.0" 1.9 CATEGORY="security" 1.10 SHORT_DESC="Gnu Privacy Assistant locales" 1.11 MAINTAINER="erjo@slitaz.org"
2.1 --- a/gpa/receipt Tue Mar 08 22:59:18 2011 +0000 2.2 +++ b/gpa/receipt Wed Mar 09 05:02:28 2011 +0100 2.3 @@ -1,24 +1,23 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="gpa" 2.7 -VERSION="0.7.5" 2.8 +VERSION="0.9.0" 2.9 CATEGORY="security" 2.10 SHORT_DESC="Gnu Privacy Assistant" 2.11 MAINTAINER="erjo@slitaz.org" 2.12 DEPENDS="gnupg gpgme libgpg-error gtk+ xorg-libXdamage" 2.13 -BUILD_DEPENDS="gpgme-dev libgpg-error-dev gnupg" 2.14 +BUILD_DEPENDS="autoconf automake" 2.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.16 WEB_SITE="http://www.gnupg.org/" 2.17 -WGET_URL="ftp://ftp.gnupg.org/gcrypt/alpha/gpa/$TARBALL" 2.18 +WGET_URL="http://wald.intevation.org/frs/download.php/603/$TARBALL" 2.19 2.20 # Rules to configure and make the package. 2.21 compile_rules() 2.22 { 2.23 cd $src 2.24 - ./configure --prefix=/usr --infodir=/usr/share/info \ 2.25 - --mandir=/usr/share/man $CONFIGURE_ARGS && 2.26 - make && 2.27 - make DESTDIR=$PWD/_pkg install 2.28 + patch -p0 < $stuff/gpa-0.9.0-libassuan2.patch && 2.29 + autoreconf && 2.30 + ./configure && make && make install 2.31 } 2.32 2.33 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gpa/stuff/gpa-0.9.0-libassuan2.patch Wed Mar 09 05:02:28 2011 +0100 3.3 @@ -0,0 +1,389 @@ 3.4 +Index: src/server.c 3.5 +=================================================================== 3.6 +--- src/server.c.orig 2009-05-13 09:11:11.000000000 +0200 3.7 ++++ src/server.c 2010-04-08 08:13:27.000000000 +0200 3.8 +@@ -568,7 +568,7 @@ prepare_io_streams (assuan_context_t ctx 3.9 + the last command. A RESET command undoes the effect of this 3.10 + command. 3.11 + */ 3.12 +-static int 3.13 ++static gpg_error_t 3.14 + cmd_session (assuan_context_t ctx, char *line) 3.15 + { 3.16 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.17 +@@ -594,7 +594,7 @@ cmd_session (assuan_context_t ctx, char 3.18 + validity right away; if it does not (as here) all recipients are 3.19 + checked at the time of the ENCRYPT command. All RECIPIENT commands 3.20 + are cumulative until a RESET or an successful ENCRYPT command. */ 3.21 +-static int 3.22 ++static gpg_error_t 3.23 + cmd_recipient (assuan_context_t ctx, char *line) 3.24 + { 3.25 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.26 +@@ -615,7 +615,7 @@ cmd_recipient (assuan_context_t ctx, cha 3.27 + Set the file descriptor to read a message which is used with 3.28 + detached signatures. 3.29 + */ 3.30 +-static int 3.31 ++static gpg_error_t 3.32 + cmd_message (assuan_context_t ctx, char *line) 3.33 + { 3.34 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.35 +@@ -659,7 +659,7 @@ cont_encrypt (assuan_context_t ctx, gpg_ 3.36 + 3.37 + Encrypt the data received on INPUT to OUTPUT. 3.38 + */ 3.39 +-static int 3.40 ++static gpg_error_t 3.41 + cmd_encrypt (assuan_context_t ctx, char *line) 3.42 + { 3.43 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.44 +@@ -755,7 +755,7 @@ cont_prep_encrypt (assuan_context_t ctx, 3.45 + 3.46 + Dummy encryption command used to check whether the given recipients 3.47 + are all valid and to tell the client the preferred protocol. */ 3.48 +-static int 3.49 ++static gpg_error_t 3.50 + cmd_prep_encrypt (assuan_context_t ctx, char *line) 3.51 + { 3.52 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.53 +@@ -814,7 +814,7 @@ cmd_prep_encrypt (assuan_context_t ctx, 3.54 + @code{RESET} command. A second command overrides the effect of 3.55 + the first one; if EMAIL is not given the server shall use the 3.56 + default signing key. */ 3.57 +-static int 3.58 ++static gpg_error_t 3.59 + cmd_sender (assuan_context_t ctx, char *line) 3.60 + { 3.61 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.62 +@@ -867,7 +867,7 @@ cont_sign (assuan_context_t ctx, gpg_err 3.63 + 3.64 + Sign the data received on INPUT to OUTPUT. 3.65 + */ 3.66 +-static int 3.67 ++static gpg_error_t 3.68 + cmd_sign (assuan_context_t ctx, char *line) 3.69 + { 3.70 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.71 +@@ -943,7 +943,7 @@ cont_decrypt (assuan_context_t ctx, gpg_ 3.72 + If the option --no-verify is given, the server should not try to 3.73 + verify a signature, in case the input data is an OpenPGP combined 3.74 + message. */ 3.75 +-static int 3.76 ++static gpg_error_t 3.77 + cmd_decrypt (assuan_context_t ctx, char *line) 3.78 + { 3.79 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.80 +@@ -1058,7 +1058,7 @@ cont_verify (assuan_context_t ctx, gpg_e 3.81 + 3.82 + The DISPLAYSTRING is a percent-and-plus-encoded string with a short 3.83 + human readable description of the status. */ 3.84 +-static int 3.85 ++static gpg_error_t 3.86 + cmd_verify (assuan_context_t ctx, char *line) 3.87 + { 3.88 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.89 +@@ -1143,7 +1143,7 @@ cmd_verify (assuan_context_t ctx, char * 3.90 + manager is brought into the foregound and that this command 3.91 + immediatley returns. 3.92 + */ 3.93 +-static int 3.94 ++static gpg_error_t 3.95 + cmd_start_keymanager (assuan_context_t ctx, char *line) 3.96 + { 3.97 + gpa_open_key_manager (NULL, NULL); 3.98 +@@ -1157,7 +1157,7 @@ cmd_start_keymanager (assuan_context_t c 3.99 + manager is brought into the foregound and that this command 3.100 + immediatley returns. 3.101 + */ 3.102 +-static int 3.103 ++static gpg_error_t 3.104 + cmd_start_cardmanager (assuan_context_t ctx, char *line) 3.105 + { 3.106 + gpa_open_cardmanager (NULL, NULL); 3.107 +@@ -1172,7 +1172,7 @@ cmd_start_cardmanager (assuan_context_t 3.108 + manager is brought into the foregound and that this command 3.109 + immediatley returns. 3.110 + */ 3.111 +-static int 3.112 ++static gpg_error_t 3.113 + cmd_start_confdialog (assuan_context_t ctx, char *line) 3.114 + { 3.115 + gpa_open_settings_dialog (NULL, NULL); 3.116 +@@ -1191,7 +1191,7 @@ cmd_start_confdialog (assuan_context_t c 3.117 + version - Return the version of the program. 3.118 + pid - Return the process id of the server. 3.119 + */ 3.120 +-static int 3.121 ++static gpg_error_t 3.122 + cmd_getinfo (assuan_context_t ctx, char *line) 3.123 + { 3.124 + gpg_error_t err; 3.125 +@@ -1295,7 +1295,7 @@ decode_percent_string (char *str) 3.126 + 3.127 + Set the files on which to operate. 3.128 + */ 3.129 +-static int 3.130 ++static gpg_error_t 3.131 + cmd_file (assuan_context_t ctx, char *line) 3.132 + { 3.133 + gpg_error_t err = 0; 3.134 +@@ -1366,7 +1366,7 @@ impl_encrypt_sign_files (assuan_context_ 3.135 + 3.136 + 3.137 + /* ENCRYPT_FILES --nohup */ 3.138 +-static int 3.139 ++static gpg_error_t 3.140 + cmd_encrypt_files (assuan_context_t ctx, char *line) 3.141 + { 3.142 + gpg_error_t err; 3.143 +@@ -1389,7 +1389,7 @@ cmd_encrypt_files (assuan_context_t ctx, 3.144 + 3.145 + 3.146 + /* SIGN_FILES --nohup */ 3.147 +-static int 3.148 ++static gpg_error_t 3.149 + cmd_sign_files (assuan_context_t ctx, char *line) 3.150 + { 3.151 + gpg_error_t err; 3.152 +@@ -1412,7 +1412,7 @@ cmd_sign_files (assuan_context_t ctx, ch 3.153 + 3.154 + 3.155 + /* ENCRYPT_SIGN_FILES --nohup */ 3.156 +-static int 3.157 ++static gpg_error_t 3.158 + cmd_encrypt_sign_files (assuan_context_t ctx, char *line) 3.159 + { 3.160 + gpg_error_t err; 3.161 +@@ -1474,7 +1474,7 @@ impl_decrypt_verify_files (assuan_contex 3.162 + 3.163 + 3.164 + /* DECRYPT_FILES --nohup */ 3.165 +-static int 3.166 ++static gpg_error_t 3.167 + cmd_decrypt_files (assuan_context_t ctx, char *line) 3.168 + { 3.169 + gpg_error_t err; 3.170 +@@ -1497,7 +1497,7 @@ cmd_decrypt_files (assuan_context_t ctx, 3.171 + 3.172 + 3.173 + /* VERIFY_FILES --nohup */ 3.174 +-static int 3.175 ++static gpg_error_t 3.176 + cmd_verify_files (assuan_context_t ctx, char *line) 3.177 + { 3.178 + gpg_error_t err; 3.179 +@@ -1520,7 +1520,7 @@ cmd_verify_files (assuan_context_t ctx, 3.180 + 3.181 + 3.182 + /* DECRYPT_VERIFY_FILES --nohup */ 3.183 +-static int 3.184 ++static gpg_error_t 3.185 + cmd_decrypt_verify_files (assuan_context_t ctx, char *line) 3.186 + { 3.187 + gpg_error_t err; 3.188 +@@ -1543,7 +1543,7 @@ cmd_decrypt_verify_files (assuan_context 3.189 + 3.190 + 3.191 + /* IMPORT_FILES --nohup */ 3.192 +-static int 3.193 ++static gpg_error_t 3.194 + cmd_import_files (assuan_context_t ctx, char *line) 3.195 + { 3.196 + gpg_error_t err; 3.197 +@@ -1567,7 +1567,7 @@ cmd_import_files (assuan_context_t ctx, 3.198 + 3.199 + 3.200 + /* CHECKSUM_CREATE_FILES --nohup */ 3.201 +-static int 3.202 ++static gpg_error_t 3.203 + cmd_checksum_create_files (assuan_context_t ctx, char *line) 3.204 + { 3.205 + gpg_error_t err; 3.206 +@@ -1591,7 +1591,7 @@ cmd_checksum_create_files (assuan_contex 3.207 + 3.208 + 3.209 + /* CHECKSUM_VERIFY_FILES --nohup */ 3.210 +-static int 3.211 ++static gpg_error_t 3.212 + cmd_checksum_verify_files (assuan_context_t ctx, char *line) 3.213 + { 3.214 + gpg_error_t err; 3.215 +@@ -1614,8 +1614,8 @@ cmd_checksum_verify_files (assuan_contex 3.216 + } 3.217 + 3.218 + 3.219 +-static void 3.220 +-reset_notify (assuan_context_t ctx) 3.221 ++static gpg_error_t 3.222 ++reset_notify (assuan_context_t ctx, char *line) 3.223 + { 3.224 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.225 + 3.226 +@@ -1639,6 +1639,7 @@ reset_notify (assuan_context_t ctx) 3.227 + ctrl->session_number = 0; 3.228 + xfree (ctrl->session_title); 3.229 + ctrl->session_title = NULL; 3.230 ++ return 0; 3.231 + } 3.232 + 3.233 + 3.234 +@@ -1648,7 +1649,7 @@ register_commands (assuan_context_t ctx) 3.235 + { 3.236 + static struct { 3.237 + const char *name; 3.238 +- int (*handler)(assuan_context_t, char *line); 3.239 ++ assuan_handler_t handler; 3.240 + } table[] = { 3.241 + { "SESSION", cmd_session }, 3.242 + { "RECIPIENT", cmd_recipient }, 3.243 +@@ -1681,7 +1682,8 @@ register_commands (assuan_context_t ctx) 3.244 + 3.245 + for (i=0; table[i].name; i++) 3.246 + { 3.247 +- rc = assuan_register_command (ctx, table[i].name, table[i].handler); 3.248 ++ rc = assuan_register_command (ctx, table[i].name, table[i].handler, 3.249 ++ NULL); 3.250 + if (rc) 3.251 + return rc; 3.252 + } 3.253 +@@ -1692,7 +1694,7 @@ register_commands (assuan_context_t ctx) 3.254 + 3.255 + /* Prepare for a new connection on descriptor FD. */ 3.256 + static assuan_context_t 3.257 +-connection_startup (int fd) 3.258 ++connection_startup (assuan_fd_t fd) 3.259 + { 3.260 + gpg_error_t err; 3.261 + assuan_context_t ctx; 3.262 +@@ -1700,7 +1702,16 @@ connection_startup (int fd) 3.263 + 3.264 + /* Get an Assuan context for the already accepted file descriptor 3.265 + FD. Allow descriptor passing. */ 3.266 +- err = assuan_init_socket_server_ext (&ctx, ASSUAN_INT2FD(fd), 1|2); 3.267 ++ err = assuan_new (&ctx); 3.268 ++ if (err) 3.269 ++ { 3.270 ++ g_debug ("failed to initialize the new connection: %s", 3.271 ++ gpg_strerror (err)); 3.272 ++ return NULL; 3.273 ++ } 3.274 ++ 3.275 ++ err = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_FDPASSING 3.276 ++ | ASSUAN_SOCKET_SERVER_ACCEPTED); 3.277 + if (err) 3.278 + { 3.279 + g_debug ("failed to initialize the new connection: %s", 3.280 +@@ -1712,7 +1723,7 @@ connection_startup (int fd) 3.281 + { 3.282 + g_debug ("failed to register commands with Assuan: %s", 3.283 + gpg_strerror (err)); 3.284 +- assuan_deinit_server (ctx); 3.285 ++ assuan_release (ctx); 3.286 + return NULL; 3.287 + } 3.288 + 3.289 +@@ -1736,8 +1747,8 @@ connection_finish (assuan_context_t ctx) 3.290 + { 3.291 + conn_ctrl_t ctrl = assuan_get_pointer (ctx); 3.292 + 3.293 +- reset_notify (ctx); 3.294 +- assuan_deinit_server (ctx); 3.295 ++ reset_notify (ctx, NULL); 3.296 ++ assuan_release (ctx); 3.297 + g_free (ctrl); 3.298 + connection_counter--; 3.299 + if (!connection_counter && shutdown_pending) 3.300 +@@ -1805,14 +1816,23 @@ receive_cb (GIOChannel *channel, GIOCond 3.301 + } 3.302 + else 3.303 + { 3.304 ++ int done = 0; 3.305 + ctrl->in_command++; 3.306 +- err = assuan_process_next (ctx); 3.307 ++ err = assuan_process_next (ctx, &done); 3.308 + ctrl->in_command--; 3.309 ++ if (err) 3.310 ++ { 3.311 ++ g_debug ("assuan_process_next returned: %s <%s>", 3.312 ++ gpg_strerror (err), gpg_strsource (err)); 3.313 ++ } 3.314 ++ else 3.315 ++ { 3.316 + g_debug ("assuan_process_next returned: %s", 3.317 +- err == -1? "EOF": gpg_strerror (err)); 3.318 ++ done ? "done" : "success"); 3.319 ++ } 3.320 + if (gpg_err_code (err) == GPG_ERR_EAGAIN) 3.321 + ; /* Ignore. */ 3.322 +- else if (gpg_err_code (err) == GPG_ERR_EOF || err == -1) 3.323 ++ else if (!err && done) 3.324 + { 3.325 + if (ctrl->cont_cmd) 3.326 + ctrl->client_died = 1; /* Need to delay the cleanup. */ 3.327 +@@ -1868,14 +1888,14 @@ accept_connection_cb (GIOChannel *listen 3.328 + g_debug ("error accepting connection: %s", strerror (errno)); 3.329 + goto leave; 3.330 + } 3.331 +- if (assuan_sock_check_nonce (ASSUAN_INT2FD(fd), &socket_nonce)) 3.332 ++ if (assuan_sock_check_nonce ((assuan_fd_t) fd, &socket_nonce)) 3.333 + { 3.334 + g_debug ("new connection at fd %d refused", fd); 3.335 + goto leave; 3.336 + } 3.337 + 3.338 + g_debug ("new connection at fd %d", fd); 3.339 +- ctx = connection_startup (fd); 3.340 ++ ctx = connection_startup ((assuan_fd_t) fd); 3.341 + if (!ctx) 3.342 + goto leave; 3.343 + 3.344 +@@ -1911,7 +1931,7 @@ accept_connection_cb (GIOChannel *listen 3.345 + 3.346 + leave: 3.347 + if (fd != -1) 3.348 +- assuan_sock_close (ASSUAN_INT2FD (fd)); 3.349 ++ assuan_sock_close ((assuan_fd_t) fd); 3.350 + return TRUE; /* Keep the listen_fd in the event loop. */ 3.351 + } 3.352 + 3.353 +@@ -1929,7 +1949,7 @@ gpa_start_server (void) 3.354 + GIOChannel *channel; 3.355 + unsigned int source_id; 3.356 + 3.357 +- assuan_set_assuan_err_source (GPG_ERR_SOURCE_DEFAULT); 3.358 ++ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); 3.359 + 3.360 + socket_name = g_build_filename (gnupg_homedir, "S.uiserver", NULL); 3.361 + if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path ) 3.362 +@@ -1974,14 +1994,14 @@ gpa_start_server (void) 3.363 + g_free (socket_name); 3.364 + socket_name = NULL; 3.365 + 3.366 +- if (listen (ASSUAN_FD2INT (fd), 5) == -1) 3.367 ++ if (listen ((int) fd, 5) == -1) 3.368 + { 3.369 + g_debug ("listen() failed: %s\n", strerror (errno)); 3.370 + assuan_sock_close (fd); 3.371 + return; 3.372 + } 3.373 + #ifdef HAVE_W32_SYSTEM 3.374 +- channel = g_io_channel_win32_new_socket (ASSUAN_FD2INT(fd)); 3.375 ++ channel = g_io_channel_win32_new_socket ((int) fd); 3.376 + #else 3.377 + channel = g_io_channel_unix_new (fd); 3.378 + #endif 3.379 +Index: configure.ac 3.380 +=================================================================== 3.381 +--- configure.ac.orig 2009-06-20 00:05:29.000000000 +0200 3.382 ++++ configure.ac 2010-04-08 08:13:27.000000000 +0200 3.383 +@@ -37,8 +37,8 @@ AC_INIT([gpa], 3.384 + [bug-gpa@gnupg.org]) 3.385 + 3.386 + NEED_GPG_ERROR_VERSION=1.4 3.387 +-NEED_LIBASSUAN_API=1 3.388 +-NEED_LIBASSUAN_VERSION=1.0.4 3.389 ++NEED_LIBASSUAN_API=2 3.390 ++NEED_LIBASSUAN_VERSION=1.1.0 3.391 + NEED_GPGME_API=1 3.392 + NEED_GPGME_VERSION=1.2.0
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/libassuan-dev/receipt Wed Mar 09 05:02:28 2011 +0100 4.3 @@ -0,0 +1,19 @@ 4.4 +# SliTaz package receipt. 4.5 + 4.6 +PACKAGE="libassuan-dev" 4.7 +VERSION="2.0.1" 4.8 +CATEGORY="development" 4.9 +SHORT_DESC="IPC library used by some of the other GnuPG related packages (devel files)." 4.10 +MAINTAINER="gokhlayeh@slitaz.org" 4.11 +WEB_SITE="http://www.gnupg.org/" 4.12 +WANTED="libassuan" 4.13 + 4.14 +# Rules to gen a SliTaz package suitable for Tazpkg. 4.15 +genpkg_rules() 4.16 +{ 4.17 + mkdir -p $fs/usr/lib $fs/usr/share 4.18 + cp -a $_pkg/usr/bin $fs/usr 4.19 + cp -a $_pkg/usr/lib/libassuan.la $fs/usr/lib 4.20 + cp -a $_pkg/usr/include $fs/usr 4.21 + cp -a $_pkg/usr/share/aclocal $fs/usr/share 4.22 +}
5.1 --- a/libassuan/receipt Tue Mar 08 22:59:18 2011 +0000 5.2 +++ b/libassuan/receipt Wed Mar 09 05:02:28 2011 +0100 5.3 @@ -9,25 +9,18 @@ 5.4 WEB_SITE="http://www.gnupg.org/" 5.5 WGET_URL="ftp://ftp.gnupg.org/gcrypt/$PACKAGE/$TARBALL" 5.6 DEPENDS="libgpg-error" 5.7 -BUILD_DEPENDS="python libgpg-error-dev pkg-config" # do not skip /usr/lib/libassuan-pth.a 5.8 +BUILD_DEPENDS="python pkg-config" # do not skip /usr/lib/libassuan-pth.a 5.9 5.10 # Rules to configure and make the package. 5.11 compile_rules() 5.12 { 5.13 cd $src 5.14 - ./configure \ 5.15 - --prefix=/usr \ 5.16 - $CONFIGURE_ARGS && 5.17 - make -j 4 && 5.18 - make DESTDIR=$PWD/_pkg install 5.19 + ./configure && make && make install 5.20 } 5.21 5.22 # Rules to gen a SliTaz package suitable for Tazpkg. 5.23 genpkg_rules() 5.24 { 5.25 - mkdir -p $fs/usr/share 5.26 - cp -a $_pkg/usr/bin $fs/usr 5.27 - cp -a $_pkg/usr/lib $fs/usr 5.28 - cp -a $_pkg/usr/include $fs/usr 5.29 - cp -a $_pkg/usr/share/aclocal $fs/usr/share 5.30 + mkdir -p $fs/usr/lib 5.31 + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 5.32 }