repo-add: fix parseopts missing arg to -k/--key

The current code treats -k/--key as a binary option which later makes it
fail parsing the argument as then the end of arguments '--' is treated
as the GPGKEY. We fix this by adding the appropriate specifier to the
long and shortopt.

Closes https://gitlab.archlinux.org/pacman/pacman/-/issues/105

Fixes: 4f43ce3e ("repo-add: use parseopts from libmakepkg")
Signed-off-by: Christian Heusel <christian@heusel.eu>

RELEASE

@@ -11,12 +11,14 @@ The following checklist should be used for making a pacman release.
 - Update doc/index.asciidoc
 - Create a signed git tag (git tag -s vX.Y.Z -m "commit message")
 - Create and sign release tarballs (generate with "ninja dist")
+- Create release on gitlab project page
+- Upload release tarball and signature to gitlab ("glab release upload ...")
 - Update pacman website
 
 Transifex updates are handled using the transifex client. The basic process is:
 - Pull updates from transifex ("tx pull -f --minimum-perc 75")
 - Update po files ("./build-aux/update-po")
-- Fix all translation errors found
+- Fix all translation errors found (e.g. using "mint-check-translations")
 - Add any new locales to the relevant LINGUAS file
 - Optional: Make any manual changes needed (e.g. fixing spacing in a string)
   and update po files again

doc/index.asciidoc

@@ -34,6 +34,8 @@ makepkg/repo-add/pacman toolchain via GnuPG and GPGME.
 Version 5.0 added support for pre/post-transaction hooks and sync database file
 list operations.
 
+Version 6.0 added support for parallel downloads.
+
 Documentation
 -------------
 
@@ -192,7 +194,9 @@ Releases
 
 |======
 
-Source code for all releases is available at
+Source code for releases since moving to gitlab is available at
+link:https://gitlab.archlinux.org/pacman/pacman/-/releases[].
+Source code for historical releases is available at
 link:https://sources.archlinux.org/other/pacman/[]. To install, download the newest
 available source tarball, unpack it in a directory, and run the three magic
 commands:
@@ -240,14 +244,10 @@ link:translation-help.html[translation-help].
 
 Bugs
 ----
-If you find bugs (which is quite likely), please email them to the pacman-dev
+If you find bugs (which is quite likely), please report them to the issue
-mailing last at mailto:pacman-dev@lists.archlinux.org[] with specific information
+tracker at link:https://gitlab.archlinux.org/pacman/pacman/-/issues[] with
-such as your command-line, the nature of the bug, and even the package database
+specific information such as your command-line, the nature of the bug, and even
-if it helps.
+the package database if it helps.
-
-You can also post a bug to the Arch Linux bug tracker
-link:https://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
-bugs under the Pacman project.
 
 Copyright
 ---------

lib/libalpm/be_local.c

@@ -838,7 +838,7 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
 				}
 				FREELIST(lines);
 			} else {
-				_alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), info->name, line);
+				_alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), info->name, line);
 				alpm_list_t *lines = NULL;
 				READ_AND_STORE_ALL(lines);
 				FREELIST(lines);

lib/libalpm/be_sync.c

@@ -692,7 +692,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 				}
 				FREELIST(lines);
 			} else {
-				_alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), pkg->name, line);
+				_alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), pkg->name, line);
 				alpm_list_t *lines = NULL;
 				READ_AND_STORE_ALL(lines);
 				FREELIST(lines);

scripts/repo-add.sh.in

@@ -605,8 +605,8 @@ trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
 trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 
 
-OPT_SHORT="knpqRsv"
+OPT_SHORT="k:npqRsv"
-OPT_LONG=('include-sigs' 'key' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
+OPT_LONG=('include-sigs' 'key:' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
           'sign' 'verify')
 if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
 	exit 1 # E_INVALID_OPTION

src/pacman/package.c

@@ -140,7 +140,7 @@ static void make_aligned_titles(void)
 		size_t padlen = maxcol - wcol[i];
 		wmemset(wbuf[i] + wlen[i], L' ', padlen);
 		wmemcpy(wbuf[i] + wlen[i] + padlen, title_suffix, ARRAYSIZE(title_suffix));
-		wcstombs(titles[i], wbuf[i], sizeof(wbuf[i]));
+		wcstombs(titles[i], wbuf[i], sizeof(titles[i]));
 	}
 }