https://github.com/nmap/nmap/commit/a946c5682d12c739c61a34082399b86254161c9a "Transition from setup.py to pyproject.toml" 0001-Don-t-recompile-Python-bytecode-unnecessarily.patch needs rebase * Package: net-analyzer/nmap-9999:0 * Repository: gentoo * Maintainer: sam@gentoo.org dilfridge@gentoo.org * USE: abi_x86_64 amd64 elibc_glibc ipv6 kernel_linux libssh2 lua_single_target_lua5-4 ncat nls nping nse python_single_target_python3_11 ssl symlink * FEATURES: ccache network-sandbox preserve-libs sandbox userpriv usersandbox * Using python3.11 to build * Using lua5.4 to build >>> Unpacking source... * Repository id: nmap_nmap.git * To override fetched repository properties, use: * EGIT_OVERRIDE_REPO_NMAP_NMAP * EGIT_OVERRIDE_BRANCH_NMAP_NMAP * EGIT_OVERRIDE_COMMIT_NMAP_NMAP * EGIT_OVERRIDE_COMMIT_DATE_NMAP_NMAP * * Fetching https://github.com/nmap/nmap ... git fetch https://github.com/nmap/nmap +HEAD:refs/git-r3/HEAD remote: Enumerating objects: 21, done. remote: Counting objects: 100% (21/21), done. remote: Compressing objects: 100% (4/4), done. remote: Total 21 (delta 17), reused 21 (delta 17), pack-reused 0 Unpacking objects: 100% (21/21), 5.50 KiB | 24.00 KiB/s, done. From https://github.com/nmap/nmap 00d71a83f..a946c5682 HEAD -> refs/git-r3/HEAD git symbolic-ref refs/git-r3/net-analyzer/nmap/0/__main__ refs/git-r3/HEAD * Checking out https://github.com/nmap/nmap to /var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999 ... git checkout --quiet refs/git-r3/HEAD GIT update --> repository: https://github.com/nmap/nmap updating from commit: 00d71a83fe34c201590ba2eb0ac744a88515c280 to commit: a946c5682d12c739c61a34082399b86254161c9a Makefile.in | 14 +++--- macosx/Makefile | 2 +- nmap-os-db | 1 + nmap-service-probes | 136 +++++++++++++++++++++++++++++++++++++------------------- zenmap/README | 2 +- zenmap/install_scripts/macosx/make-bundle.sh | 5 +-- zenmap/install_scripts/macosx/zenmap.bundle | 2 +- zenmap/install_scripts/windows/PKGBUILD | 4 +- zenmap/pyproject.toml | 48 ++++++++++++++++++++ zenmap/setup.py | 586 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 10 files changed, 151 insertions(+), 649 deletions(-) >>> Unpacking nmap-7.95-patches.tar.xz to /var/tmp/portage/net-analyzer/nmap-9999/work >>> Source unpacked in /var/tmp/portage/net-analyzer/nmap-9999/work >>> Preparing source in /var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999 ... * Applying patches from /var/tmp/portage/net-analyzer/nmap-9999/work/nmap-7.95-patches ... * 0001-Don-t-recompile-Python-bytecode-unnecessarily.patch ... patching file Makefile.in Hunk #1 FAILED at 369. Hunk #2 succeeded at 382 (offset -4 lines). 1 out of 2 hunks FAILED -- saving rejects to file Makefile.in.rej [ !! ] * ERROR: net-analyzer/nmap-9999::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/net-analyzer/nmap-9999/work/nmap-7.95-patches/0001-Don-t-recompile-Python-bytecode-unnecessarily.patch * * Call stack: * ebuild.sh, line 136: Called src_prepare * environment, line 3675: Called default * phase-functions.sh, line 873: Called default_src_prepare * phase-functions.sh, line 949: Called __eapi8_src_prepare * environment, line 366: Called eapply '--' '/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-7.95-patches' * environment, line 1645: Called _eapply_patch '/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-7.95-patches/0001-Don-t-recompile-Python-bytecode-unnecessarily.patch' ' ' * environment, line 1587: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/net-analyzer/nmap-9999/work/nmap-7.95-patches/0001-Don-t-recompile-Python-bytecode-unnecessarily.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@"
[ebuild R *] net-analyzer/nmap-9999::gentoo USE="ipv6 libssh2 ncat nls nping nse ssl symlink -ndiff -zenmap" LUA_SINGLE_TARGET="lua5-4" PYTHON_SINGLE_TARGET="python3_11 -python3_10" 0 KiB Portage 3.0.63_p32 (python 3.12.2-final-0, default/linux/amd64/23.0, gcc-13, glibc-2.39-r2, 6.9.0-rc1 x86_64) ================================================================= System Settings ================================================================= System uname: Linux-6.9.0-rc1-x86_64-AMD_Athlon-tm-_II_X2_240_Processor-with-glibc2.39 KiB Mem: 4026528 total, 1140056 free KiB Swap: 11147088 total, 9406876 free Timestamp of repository FireBurn: Sun, 24 Mar 2024 09:48:23 +0000 Head commit of repository FireBurn: c65cbf3cdabe17d948bc228444e4ebb82da767d8 Timestamp of repository gamerlay: Sun, 24 Mar 2024 09:48:25 +0000 Head commit of repository gamerlay: bed95bdfccae6ddb7957e73efc6985b1f9f57851 Timestamp of repository gerislay: Sun, 24 Mar 2024 09:48:36 +0000 Head commit of repository gerislay: 8db67fc82bca6ab32567272ce86b230c61f7e614 Timestamp of repository java: Sun, 24 Mar 2024 09:48:25 +0000 Head commit of repository java: 93ff048514e1a0f8d6bdeeed42735ac0f43a64ba Timestamp of repository kde: Thu, 21 Mar 2024 15:48:49 +0000 Head commit of repository kde: e9594ba2548659618744802bba648288379244ac Head commit of repository netfab-overlay: 515bc710830ed22b794330d1d233a68dda4da5b1 Timestamp of repository pg_overlay: Sun, 24 Mar 2024 09:48:31 +0000 Head commit of repository pg_overlay: ffa82a8352fa5e628afba8e3eb17c9325b558d28 Timestamp of repository poly-c: Sun, 24 Mar 2024 20:39:47 +0000 Timestamp of repository qt: Sat, 23 Mar 2024 13:48:18 +0000 Head commit of repository qt: 7d6e43e1727b49ebbedd4a5ce1e9da9dff44eacf Timestamp of repository seden: Sun, 24 Mar 2024 09:48:29 +0000 Head commit of repository seden: 78d2ea5842d78c74104f71697e5447de8b72f42c Timestamp of repository stefantalpalaru: Sun, 24 Mar 2024 09:48:29 +0000 Head commit of repository stefantalpalaru: 65ae57a28bc1a1b77cdf415bdf6a94678ccf60aa Timestamp of repository x11: Fri, 15 Mar 2024 21:04:00 +0000 Head commit of repository x11: 9a32c610ac408d5a1842ee50b2c1fa43094446c1 Timestamp of repository gentoo: Mon, 25 Mar 2024 00:19:16 +0000 Head commit of repository gentoo: 3bfd31f65374a6b31e374eef6afa18f97c433a5a Timestamp of repository edgets: Sun, 24 Mar 2024 09:48:40 +0000 Head commit of repository edgets: 0f60c49c48b1f8c2710f25573773bc8b864919fd Timestamp of repository guru: Sun, 24 Mar 2024 19:48:30 +0000 Head commit of repository guru: cf10a8b022028f87123183453270b08f15433b95 sh bash 5.2_p26 ld GNU ld (Gentoo 2.42 p3) 2.42.0 ccache version 4.9.1 [enabled] app-misc/pax-utils: 1.3.7::gentoo app-shells/bash: 5.2_p26::gentoo dev-build/autoconf: 2.72-r1::gentoo dev-build/automake: 1.16.5-r2::gentoo dev-build/cmake: 3.29.0::gentoo dev-build/libtool: 2.4.7-r3::gentoo dev-build/make: 4.4.1-r1::gentoo dev-build/meson: 1.4.0-r1::gentoo dev-java/java-config: 2.3.3-r1::gentoo dev-lang/perl: 5.38.2-r2::gentoo dev-lang/python: 3.11.8_p1::gentoo, 3.12.2_p1::gentoo dev-lang/rust-bin: 1.76.0::gentoo dev-util/ccache: 4.9.1-r1::gentoo sys-apps/baselayout: 2.15::gentoo sys-apps/openrc: 0.53::gentoo sys-apps/sandbox: 2.38::gentoo sys-devel/binutils: 2.42-r1::gentoo sys-devel/binutils-config: 5.5::gentoo sys-devel/clang: 17.0.6::gentoo sys-devel/gcc: 13.2.1_p20240323::gentoo sys-devel/gcc-config: 2.11::gentoo sys-devel/llvm: 17.0.6::gentoo sys-kernel/linux-headers: 6.7::gentoo (virtual/os-headers) sys-libs/glibc: 2.39-r2::gentoo Repositories: FireBurn location: /var/db/repos/FireBurn sync-type: git sync-uri: https://github.com/gentoo-mirror/FireBurn.git masters: gentoo priority: -1001 volatile: False gamerlay location: /var/db/repos/gamerlay sync-type: git sync-uri: https://github.com/gentoo-mirror/gamerlay.git masters: gentoo priority: -1001 volatile: False gerislay location: /var/db/repos/gerislay sync-type: git sync-uri: https://github.com/gentoo-mirror/gerislay.git masters: gentoo priority: -1001 volatile: False java location: /var/db/repos/java sync-type: git sync-uri: https://github.com/gentoo-mirror/java.git masters: gentoo priority: -1001 volatile: False kde location: /var/db/repos/kde sync-type: git sync-uri: https://github.com/gentoo-mirror/kde.git masters: gentoo priority: -1001 volatile: False netfab-overlay location: /var/db/repos/netfab-overlay sync-type: git sync-uri: https://github.com/netfab/overlay masters: gentoo priority: -1001 volatile: False overlay_jl location: /var/db/repos/overlay_jl masters: gentoo priority: -1001 volatile: False pg_overlay location: /var/db/repos/pg_overlay sync-type: git sync-uri: https://github.com/gentoo-mirror/pg_overlay.git masters: gentoo priority: -1001 volatile: False poly-c location: /var/db/repos/poly-c sync-type: rsync sync-uri: rsync://rsync.gentoofan.org/poly-c masters: gentoo priority: -1001 volatile: False sync-rsync-extra-opts: qt location: /var/db/repos/qt sync-type: git sync-uri: https://github.com/gentoo-mirror/qt.git masters: gentoo priority: -1001 volatile: False seden location: /var/db/repos/seden sync-type: git sync-uri: https://github.com/gentoo-mirror/seden.git masters: gentoo priority: -1001 volatile: False stefantalpalaru location: /var/db/repos/stefantalpalaru sync-type: git sync-uri: https://github.com/gentoo-mirror/stefantalpalaru.git masters: gentoo priority: -1001 volatile: False x11 location: /var/db/repos/x11 sync-type: git sync-uri: https://github.com/gentoo-mirror/x11.git masters: gentoo priority: -1001 volatile: False gentoo location: /var/db/repos/gentoo sync-type: git sync-uri: https://github.com/gentoo-mirror/gentoo.git priority: -1000 volatile: False edgets location: /var/db/repos/edgets sync-type: git sync-uri: https://github.com/gentoo-mirror/edgets.git masters: gentoo volatile: False guru location: /var/db/repos/guru sync-type: git sync-uri: https://github.com/gentoo-mirror/guru.git masters: gentoo volatile: False ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="*" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=native -mtune=native -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /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" CXXFLAGS="-march=native -mtune=native -O2 -pipe" DISTDIR="/var/cache/distfiles" EMERGE_DEFAULT_OPTS="--autounmask=y --autounmask-write=y --keep-going --quiet-build=y --verbose-conflicts" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE 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 XDG_STATE_HOME" FCFLAGS="-march=native -mtune=native -O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg-live ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync merge-wait multilib-strict network-sandbox news parallel-fetch pid-sandbox pkgdir-index-trusted preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-march=native -mtune=native -O2 -pipe" GENTOO_MIRRORS="http://ftp.halifax.rwth-aachen.de/gentoo/ https://mirrors.dotsrc.org/gentoo/ https://mirror.leaseweb.com/gentoo/" LANG="de_DE.utf8" LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs" LEX="flex" LINGUAS="de" MAKEOPTS="-j2" PKGDIR="/var/cache/binpkgs" 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" SHELL="/bin/bash" USE="a52 aac aacplus aacs aalib acl acpi activefilter admin adns aften alsa amd64 amdgpu ap apm apng archive arping atahpt atapromise audiofile automount avif bash bazaar bdplus bluray boost btrfs bzip2 cairo ccache cdda cddb cdio cdr cdrom chm chroot cjk cli client colordiff colorpicker compress corefonts cpio cpuload crypt css cue cups curl custom-modes d3d9 dav1d dbus declarative designer dga dhcp dom dri dri3 drm dts duktape dump dv dvb dvd dvdnav eap eap-sim eap-tls ebook egl elogind encode enscript epub equalizer exif extensions extras faac faad farstream fat fax fbcon fdformat fdk ffmpeg fftw firefox flac flashrom fluidsynth fontconfig foomatic freedoom ft2232-spi ftd2xx ftdi ftp fullscreen fuse gadu gd gdk-pixbuf gegl geoip gif git gpg gphoto2 graphite grub gstreamer gtk gtk4 gui gusb gzip haptic hddtemp hdf hdf5 hid highlight history hpcups hpijs http http2 iconv icu id3tag idn imagemagick initramfs inotify introspection ipc ipod ipv6 iso jack jbootstrap jit jpeg jpeg2k jpegxl kde keyfinder kiosk ladspa lame lcms legacy-systray lensfun libaom libass libcanberra libdrm libinput libmpv libnotify libplacebo libproxy librtmp libsamplerate libssh2 libtirpc libv4l libwww linux-mtd linux-spi live lm-sensors logitech logrotate lua lv2 lximage lz4 lzma lzo mad magic man matroska md5sum meanwhile mediatek-i2c-spi mercurial metalink midi mikmod mime minizip mixer mjpeg mmap mms mng mod modern-top modplug modules-compress mono mount mouse mp3 mp4 mpeg mpeg2 mplayer mstarddc-spi mtp multilib multimedia musepack musicbrainz nano-syntax ncat ncurses network networkmonitor newnet ngspice nls normalize nowlistening nping ntfs ntfsprogs ntp nvidia nvme obex ocr odbc odf offload ogg ogm openal opencl opengl openh264 openmp openssl opus osdmenu otr p2p pam pango panorama parse-clocks pcap pci pcre pcre16 pcre32 pdf pdfimport phonon pipes pipewire pipewire-alsa pkcs11 plasma plugins png policykit postproc postscript powermanagement ppds printsupport privacy projectm pulseaudio pvr python qalculate qdbus qml qrcode qt6 qtkeychain quicktime radio rar raw readline realtek-mst-i2c-spi replaygain rtc rtmp rubberband rust rustfmt sbsms scanner screencast screensaver scripttools sdl seccomp secure-delete sensors serial serialport sftp sha512 shorten sixel skins slang smartcard smi sndfile sockets socks socks5 sound sound-server source-highlight speech speex spell spi spirv sql sqlite sqlite3 squashfs ssh ssl staging startup-notification statistics statusnotifier stk stream subtitles sudo svg symlink sync-plugin-portage syslog sysstat system-ffmpeg system-harfbuzz system-icu system-jpeg system-libvpx system-sqlite sysv-utils szip taglib test-rust text texteffect tftp themes theora threads thumbnail tiff timidity tracepath translator truetype twolame udev udf udisks unicode upower urlpicpreview usb utils v4l v4l2 vaapi vala vamp vector-icons video videos virtualbox vkd3d vnc vorbis vpx vroot vst vulkan vulkaninfo wad wav wavpack wayland wayland-compositor webp widgets wps wxwidgets x264 x265 xattr xfs xml xvid xwayland yahoo zink zip zlib zstd zvbi" ABI_X86="64" ADA_TARGET="gcc_12" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_anon authn_dbm authn_file authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir env expires ext_filter file_cache filter headers include info log_config logio 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="mmx mmxext popcnt sse sse2 sse3 sse4a" CURL_SSL="openssl" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 ntrip navcom oceanserver oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 tsip tripmate tnt ublox" INPUT_DEVICES="libinput" KERNEL="linux" L10N="de" LCD_DEVICES="bayrad cfontz glk hd44780 lb216 lcdm001 mtxorb text" LLVM_TARGETS="AMDGPU" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php8-1" POSTGRES_TARGETS="postgres15" PYTHON_SINGLE_TARGET="python3_11" PYTHON_TARGETS="python3_11 python3_12" RUBY_TARGETS="ruby33" VIDEO_CARDS="radeon amdgpu radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipp2p iface geoip fuzzy condition tarpit sysrq proto logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PYTHONPATH, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
This patch works: ```patch diff --git a/Makefile.in b/Makefile.in index dee2729d2..7c84cbfd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -365,7 +365,7 @@ build-zenmap: $(ZENMAPDIR)/pyproject.toml $(ZENMAPDIR)/zenmapCore/Version.py install-zenmap: $(ZENMAPDIR)/pyproject.toml $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 - $(PYTHON) -m pip install $(ZENMAPDIR) $(if $(DESTDIR),--root "$(DESTDIR)") + $(PYTHON) -m pip install $(ZENMAPDIR) $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is # already a link. @@ -382,7 +382,7 @@ build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGD @cd $(NPINGDIR) && $(MAKE) install-ndiff: - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") + cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile NSE_FILES = scripts/script.db scripts/*.nse NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc ``` I also had to drop the `0002-Drop-uninstaller-from-zenmap.patch` as the file `zenmap/setup.py` no longer exists, they migrated to `pyproject.toml`, which doesn't have the equivalent IIUC. Also, I am used to the patches being adjacent to the ebuild files in the `files/` directory, e.g. `/var/db/repos/gentoo/net-analyzer/nmap/files/*.patch`, rather than being downloaded from a user directory on distfiles. Is this normal? Is this a temporary thing?
(In reply to Berne Campbell from comment #2) > This patch works: > [...] Thanks! > Also, I am used to the patches being adjacent to the ebuild files in the > `files/` directory, e.g. > `/var/db/repos/gentoo/net-analyzer/nmap/files/*.patch`, rather than being > downloaded from a user directory on distfiles. Is this normal? Is this a > temporary thing? It's a standard thing if the patchset is large. You've just been lucky enough to not see it before now ;)
