When trying to sync with tarsync webrsync I get this output: # emaint sync --auto >>> Syncing repository 'gentoo' into '/usr/portage'... * Using keys from /usr/share/openpgp-keys/gentoo-release.asc * Refreshing keys via WKD ... [ ok ] Fetching most recent snapshot ... Trying to retrieve 20211001 snapshot from https://mirrors.dotsrc.org/gentoo ... Fetching file gentoo-20211001.tar.xz.md5sum ... Fetching file gentoo-20211001.tar.xz.gpgsig ... Fetching file gentoo-20211001.tar.xz ... Checking digest ... Checking signature ... gpg: Signature made Sat 02 Oct 2021 02:56:23 AM CEST gpg: using RSA key E1D6ABB63BFCFB4BA02FDF1CEC590EEAC9189250 gpg: Good signature from "Gentoo ebuild repository signing key (Automated Signing Key) <infrastructure@gentoo.org>" [ultimate] gpg: aka "Gentoo Portage Snapshot Signing Key (Automated Signing Key)" [ultimate] Getting snapshot timestamp ... Syncing local tree ... scanning tarball... symlinks not supported scanning existing target directory... 4171 to update 4171 files written, 144062 entires verified, 14111643 bytes written === Sync completed for gentoo Notice the warning about "symlinks not supported". If I then try to verify the repo with gemato I get this: # gemato verify -K /usr/share/openpgp-keys/gentoo-release.asc /usr/portage INFO:root:Refreshing keys... INFO:root:Keys refreshed. INFO:root:Manifest timestamp: 2021-10-02 00:39:09 UTC INFO:root:Valid OpenPGP signature found: INFO:root:- primary key: DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D INFO:root:- subkey: E1D6ABB63BFCFB4BA02FDF1CEC590EEAC9189250 INFO:root:- timestamp: 2021-10-02 00:39:09 UTC INFO:root:Verifying /usr/portage... ERROR:root:Manifest mismatch for net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch __exists__: expected: True, have: False I've unpacked the snapshot and verified that the file net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch really is a symlink. I don't know if symlinks are allowed in repos. If they are not allowed there should be better QA to autodetect symlinks. If symlinks are allowed tarsync support needs to be updated or removed. Webrsyncing without tarsync installed will install the symlink as expected. Portage 3.0.20 (python 3.9.6-final-0, default/linux/amd64/17.1/desktop, gcc-10.3.0, glibc-2.33-r1, 5.10.64 x86_64) ================================================================= System uname: Linux-5.10.64-x86_64-Intel-R-_Core-TM-_i7-4790K_CPU_@_4.00GHz-with-glibc2.33 KiB Mem: 16174076 total, 6333732 free KiB Swap: 8388604 total, 8388604 free Timestamp of repository gentoo: Sat, 02 Oct 2021 00:45:01 +0000 sh bash 5.1_p8 ld GNU ld (Gentoo 2.37_p1 p0) 2.37 ccache version 4.3 [disabled] app-shells/bash: 5.1_p8::gentoo dev-lang/perl: 5.34.0-r2::gentoo dev-lang/python: 2.7.18_p13::gentoo, 3.9.6_p2::gentoo dev-lang/rust: 1.53.0::gentoo dev-util/ccache: 4.3-r3::gentoo dev-util/cmake: 3.20.5::gentoo sys-apps/baselayout: 2.7::gentoo sys-apps/openrc: 0.43.5::gentoo sys-apps/sandbox: 2.24::gentoo sys-devel/autoconf: 2.13-r1::gentoo, 2.69-r5::gentoo sys-devel/automake: 1.16.4::gentoo sys-devel/binutils: 2.37_p1::gentoo sys-devel/gcc: 10.3.0-r2::gentoo sys-devel/gcc-config: 2.4::gentoo sys-devel/libtool: 2.4.6-r6::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.10::gentoo (virtual/os-headers) sys-libs/glibc: 2.33-r1::gentoo Repositories: gentoo location: /usr/portage sync-type: webrsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-webrsync-verify-signature: yes tholins-overlay location: /usr/local/portage/my-overlay masters: gentoo priority: 0 ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="*" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -march=native -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/lib64/tomoyo/conf /usr/share/config /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -march=native -pipe" DISTDIR="/usr/portage/distfiles" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs compress-build-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch parallel-install pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms splitdebug strict unknown-features-warn unmerge-backup unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="https://mirrors.dotsrc.org/gentoo/ https://ftp.belnet.be/pub/rsync.gentoo.org/gentoo/ https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" LANG="en_US.utf8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j6 -l8" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" USE="X a52 aac acl acpi alsa amd64 branding bzip2 cairo cdda cdr cjk cli crypt dbus dri dts dvd dvdr elogind emboss encode exif flac fortran gdbm gif gpm gtk gui hardened iconv icu jpeg lcms libglvnd libnotify libtirpc mad mng mp3 mp4 mpeg multilib ncurses nls nptl offensive ogg opengl openmp pam pango pcre pdf png policykit ppds python qt5 readline sdl seccomp spell split-usr ssl startup-notification svg tcpd tiff truetype udev udisks unicode upower usb verify-sig vorbis wayland wxwidgets x264 xattr xcb xinerama xml xv xvid zlib" ABI_X86="64" ADA_TARGET="gnat_2019" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="pc" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-3 php7-4" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9" RUBY_TARGETS="ruby26" USERLAND="GNU" VIDEO_CARDS="vesa intel i965" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RUSTFLAGS Reproducible: Always
@chutzpah would you might changing net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch to a regular file until we can get this fixed?
(In reply to Zac Medico from comment #1) > @chutzpah would you might changing > net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch to a regular file > until we can get this fixed? Yeah, done that for now.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49dcbb380e9fc848b3908b3cbae0cb0b956d3b8 commit a49dcbb380e9fc848b3908b3cbae0cb0b956d3b8 Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2021-10-06 06:49:39 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2021-10-06 06:52:38 +0000 app-arch/tarsync: 0.2.1-r2 for symlink support Bug: https://bugs.gentoo.org/815823 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico@gentoo.org> app-arch/tarsync/files/tarsync-0.2.1-symlink.patch | 139 +++++++++++++++++++++ app-arch/tarsync/tarsync-0.2.1-r2.ebuild | 34 +++++ 2 files changed, 173 insertions(+)
I've verified that tarsync-0.2.1-r2 is able to replace a file with a symlink, and replace a symlink with a file, as shown: > $ cd /var/db/repos/gentoo/net-misc/openssh/files/ > $ rm openssh-8.8_p1-hpn-15.2-glue.patch > $ mv openssh-8.7_p1-hpn-15.2-glue.patch openssh-8.8_p1-hpn-15.2-glue.patch > $ ln -s openssh-8.8_p1-hpn-15.2-glue.patch openssh-8.7_p1-hpn-15.2-glue.patch > $ ls -l openssh-8.8_p1-hpn-15.2-glue.patch openssh-8.7_p1-hpn-15.2-glue.patch > lrwxrwxrwx 1 zmedico zmedico 34 Oct 6 20:45 openssh-8.7_p1-hpn-15.2-glue.patch -> openssh-8.8_p1-hpn-15.2-glue.patch > -rw-r--r-- 1 zmedico zmedico 7354 Aug 26 17:39 openssh-8.8_p1-hpn-15.2-glue.patch > $ tarsync -v -s 1 /var/cache/distfiles/gentoo-20211005.tar.xz /var/db/repos/gentoo > scanning tarball... > cleansed 1 dups out of 148034 > scanning existing target directory... > removing node 'net-misc/openssh/files/' 'openssh-8.7_p1-hpn-15.2-glue.patch' > removing node 'net-misc/openssh/files/' 'openssh-8.8_p1-hpn-15.2-glue.patch' > 2 to update > writing net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch > creating net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch > 2 files written, 148031 entires verified, 7354 bytes written > $ ls -l openssh-8.8_p1-hpn-15.2-glue.patch openssh-8.7_p1-hpn-15.2-glue.patch > -rw-r--r-- 1 zmedico zmedico 7354 Aug 26 17:39 openssh-8.7_p1-hpn-15.2-glue.patch > lrwxrwxrwx 1 zmedico zmedico 34 Oct 6 20:46 openssh-8.8_p1-hpn-15.2-glue.patch -> openssh-8.7_p1-hpn-15.2-glue.patch
This fix is now in stable bug 821877.
