March 2023 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/rust-miniz_oxide.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-miniz_oxide.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-miniz_oxide.git/commit/?id=bb8…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit bb8819a74b91a9266a2be2221895dc3714008fde Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 22:05:45 2023 +0200 Update to version 0.6.2 diff --git a/.gitignore b/.gitignore index 22bd19c..0acfaa9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /miniz_oxide-0.4.3.crate /miniz_oxide-0.4.4.crate /miniz_oxide-0.5.3.crate +/miniz_oxide-0.6.2.crate diff --git a/README.md b/README.md deleted file mode 100644 index e58fc5b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-miniz_oxide - -The rust-miniz_oxide package \ No newline at end of file diff --git a/rust-miniz_oxide.spec b/rust-miniz_oxide.spec index e99008d..2d1f3ba 100644 --- a/rust-miniz_oxide.spec +++ b/rust-miniz_oxide.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate miniz_oxide Name: rust-miniz_oxide -Version: 0.5.3 +Version: 0.6.2 Release: %autorelease Summary: DEFLATE compression and decompression library rewritten in Rust based on miniz @@ -13,12 +13,11 @@ License: MIT OR Zlib OR Apache-2.0 URL: https://crates.io/crates/miniz_oxide Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -DEFLATE compression and decompression library rewritten in Rust based on miniz.} +DEFLATE compression and decompression library rewritten in Rust based on +miniz.} %description %{_description} @@ -51,6 +50,30 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+std-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+std-devel %{_description} + +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. + +%files -n %{name}+std-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+with-alloc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+with-alloc-devel %{_description} + +This package contains library source intended for building other packages which +use the "with-alloc" feature of the "%{crate}" crate. + +%files -n %{name}+with-alloc-devel +%ghost %{crate_instdir}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep diff --git a/sources b/sources index badca0e..cf3eaf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (miniz_oxide-0.5.3.crate) = cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5 +SHA512 (miniz_oxide-0.6.2.crate) = 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419

1 0

Architecture specific change in rpms/netcdf-fortran.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/netcdf-fortran.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netcdf-fortran.git/commit/?id=d94c3…. Change: +%ifnarch s390x Thanks. Full change: ============ commit d94c3217dad39ea8c48979482bb10c30610408c1 Author: Orion Poplawski <orion(a)nwra.com> Date: Thu Mar 30 09:19:08 2023 -0600 Update to 4.6.0 Drop i686 builds Cleanup spec and drop old workarounds diff --git a/.gitignore b/.gitignore index 9e690e5..807e300 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /netcdf-fortran-4.5.2.tar.gz /netcdf-fortran-4.5.4.tar.gz /netcdf-fortran-4.5.3.tar.gz +/netcdf-fortran-4.6.0.tar.gz diff --git a/netcdf-fortran.spec b/netcdf-fortran.spec index be767c6..997bc77 100644 --- a/netcdf-fortran.spec +++ b/netcdf-fortran.spec @@ -1,6 +1,6 @@ Name: netcdf-fortran -Version: 4.5.4 -Release: 3%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: Fortran libraries for NetCDF-4 License: NetCDF and ASL 2.0 @@ -8,24 +8,18 @@ URL: http://www.unidata.ucar.edu/software/netcdf/ Source0: https://github.com/Unidata/%{name}/archive/v%{version}.tar.gz#/%{name}-%{ve… # Use pkgconfig in nf-config to avoid multi-lib issues and remove FFLAGS Patch1: netcdf-fortran-pkgconfig.patch +%if 0%{?fedora} >= 38 +ExcludeArch: %{ix86} +%endif -BuildRequires: make BuildRequires: gcc-gfortran +BuildRequires: make BuildRequires: netcdf-devel >= 4.6.0 -#mpiexec segfaults if ssh is not present -#https://trac.mcs.anl.gov/projects/mpich2/ticket/1576 -BuildRequires: openssh-clients # For Patch1 BuildRequires: libtool %global with_mpich 1 %global with_openmpi 1 -%if 0%{?rhel} <= 6 -%ifarch ppc64 -# No mpich on ppc64 in EL6 -%global with_mpich 0 -%endif -%endif %if %{with_mpich} %global mpi_list mpich @@ -63,8 +57,6 @@ This package contains the NetCDF Fortran static library. Summary: NetCDF Fortran mpich libraries BuildRequires: mpich-devel BuildRequires: netcdf-mpich-devel -Provides: %{name}-mpich2 = %{version}-%{release} -Obsoletes: %{name}-mpich2 < 4.2-10 %description mpich NetCDF Fortran parallel mpich libraries @@ -77,8 +69,6 @@ Requires: gcc-gfortran%{_isa} Requires: pkgconfig Requires: netcdf-mpich-devel Requires: libcurl-devel -Provides: %{name}-mpich2-devel = %{version}-%{release} -Obsoletes: %{name}-mpich2-devel < 4.2-10 %description mpich-devel NetCDF Fortran parallel mpich development files @@ -87,8 +77,6 @@ NetCDF Fortran parallel mpich development files %package mpich-static Summary: NetCDF Fortran mpich static libraries Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release} -Provides: %{name}-mpich2-static = %{version}-%{release} -Obsoletes: %{name}-mpich2-static < 4.2-10 %description mpich-static NetCDF Fortran parallel mpich static libraries @@ -128,18 +116,12 @@ NetCDF Fortran parallel openmpi static libraries %prep -%setup -q -%patch1 -p1 -b .pkgconfig +%autosetup -p1 autoreconf sed -i -e '1i#!/bin/sh' examples/F90/run_f90_par_examples.sh %build -# This package fails its testsuite if LTO is enabled on i686 -# Disable LTO for now -%ifarch i686 -%define _lto_cflags %{nil} -%endif #Do out of tree builds %global _configure ../configure @@ -151,15 +133,8 @@ export F77="gfortran" export FC="gfortran" export FCFLAGS="$RPM_OPT_FLAGS" export FFLAGS="$RPM_OPT_FLAGS" -# Temporary fix for FTBFS due to gcc 10 - reported upstream: -# https://github.com/Unidata/netcdf-fortran/issues/212 -%if 0%{?fedora} >= 32 -export FCFLAGS="$FCFLAGS -fallow-argument-mismatch" -export FFLAGS="$FFLAGS -fallow-argument-mismatch" -%endif %configure --enable-extra-example-tests --with-fmoddir=%{_fmoddir} -# Seeing failures with highly parallel builds, e.g. -j12 on ppc64le -make #{?_smp_mflags} +%make_build popd # MPI builds @@ -181,7 +156,8 @@ do --with-fmoddir=%{_fmoddir}/${mpi} \ --enable-parallel \ --enable-parallel-tests - make #{?_smp_mflags} + %make_build + #make #{?_smp_mflags} module purge popd done @@ -203,15 +179,16 @@ done %check make -C build check VERBOSE=1 -# Handle builders that can't resolve their own name -sed -i -s 's/mpiexec/mpiexec -host localhost/' */*.sh -# mpich tests hang on s390x on EL9 -%if 0%{?el} != 9 && "%{_arch}" != "s390x" +# mpich tests hang on s390x +%ifnarch s390x +# Allow oversubscription with openmpi +export OMPI_MCA_rmaps_base_oversubscribe=1 +# openmpi 5+ +export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe for mpi in %{mpi_list} do module load mpi/$mpi-%{_arch} - # mpich is failing - see https://github.com/Unidata/netcdf-fortran/pull/41 - make -C $mpi check VERBOSE=1 || : + make -C $mpi check VERBOSE=1 module purge done %endif @@ -279,6 +256,11 @@ done %changelog +* Thu Mar 30 2023 Orion Poplawski <orion(a)nwra.com> - 4.6.0-1 +- Update to 4.6.0 +- Drop i686 builds +- Cleanup spec and drop old workarounds + * Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 12cccbc..b3805b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netcdf-fortran-4.5.4.tar.gz) = a704f6483f2c8b8bf2353615a3e4b784294bd790588cfc13193c617e776e330edb17fa16da69e1a0b6c767308992321e01399ba2067c32f6ae6b3cb9ff72c3ee +SHA512 (netcdf-fortran-4.6.0.tar.gz) = 2488c0d9d9df49c56253dda1a411c50bb32a52651bd5d43e303190ca7de06db3f48621da0c7faf48aaee01f7d74031b199fcfbecb2ba523a994c00470680f014

1 0

Architecture specific change in rpms/ncl.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/ncl.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ncl.git/commit/?id=8590ba1597337ba1…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 8590ba1597337ba1c94c343eb6eb1e718ee0a6cd Author: Orion Poplawski <orion(a)nwra.com> Date: Thu Mar 30 07:28:23 2023 -0600 Drop i686 builds diff --git a/ncl.spec b/ncl.spec index 30a5171..694af5b 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without flexiblas %endif %if %{with flexiblas} @@ -9,7 +9,7 @@ Name: ncl Version: 6.6.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: NCAR Command Language and NCAR Graphics License: BSD @@ -18,6 +18,7 @@ Source0: https://github.com/NCAR/ncl/archive/%{version}/%{name}-%{version Source1: Site.local.ncl Source2: ncarg.csh Source3: ncarg.sh +ExcludeArch: %{ix86} # ymake uses cpp with some defines on the command line to generate a # Makefile which consists in: @@ -63,10 +64,10 @@ Patch16: ncl-5.2.1-secondary.patch # Fix build with proj8 Patch17: ncl-proj8.patch -BuildRequires: make BuildRequires: /bin/csh BuildRequires: gcc-c++ BuildRequires: gcc-gfortran +BuildRequires: make BuildRequires: netcdf-fortran-devel BuildRequires: cairo-devel BuildRequires: hdf-static, hdf-devel >= 4.2r2 @@ -187,7 +188,7 @@ sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex$[^ ;]*$;loadscript(ncargpath(" #make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC -Werror-implicit-function-declaration" F77=gfortran F77_LD=gfortran\ FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore -fno-range-check -fopenmp" -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 FCOPTIONS="$FCOPTIONS -fallow-argument-mismatch -fcommon" %endif make Build CCOPTIONS="$RPM_OPT_FLAGS -std=c99 -fPIC -fno-strict-aliasing -fopenmp -fcommon -DH5_USE_110_API" \ @@ -359,6 +360,9 @@ done %changelog +* Thu Mar 30 2023 Orion Poplawski <orion(a)nwra.com> - 6.6.2-34 +- Drop i686 builds + * Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.6.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

1 0

Architecture specific change in rpms/rust-zeroize.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-zeroize.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-zeroize.git/commit/?id=4cb568d…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 4cb568d0507f6b3d720804145ec2eb76379d830c Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 15:08:13 2023 +0200 Update to version 1.6.0; Fixes RHBZ#2181927 diff --git a/README.md b/README.md deleted file mode 100644 index d9adcc5..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-zeroize - -The rust-zeroize package \ No newline at end of file diff --git a/rust-zeroize.spec b/rust-zeroize.spec index dfeabd1..fb46bbb 100644 --- a/rust-zeroize.spec +++ b/rust-zeroize.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate zeroize Name: rust-zeroize -Version: 1.5.7 +Version: 1.6.0 Release: %autorelease Summary: Securely clear secrets from memory @@ -13,15 +13,13 @@ License: Apache-2.0 OR MIT URL: https://crates.io/crates/zeroize Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Securely clear secrets from memory with a simple trait built on stable Rust -primitives which guarantee memory is zeroed using an operation will not be -'optimized away' by the compiler. Uses a portable pure Rust implementation that -works everywhere, even WASM!.} +Securely clear secrets from memory with a simple trait built on stable +Rust primitives which guarantee memory is zeroed using an operation will +not be 'optimized away' by the compiler. Uses a portable pure Rust +implementation that works everywhere, even WASM!.} %description %{_description} diff --git a/sources b/sources index 462fa57..b666719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeroize-1.5.7.crate) = e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9 +SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b commit 83094d47a2f1c83f583161f46831f1db22540745 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jan 21 02:28:25 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>

1 0

Architecture specific change in rpms/rust-zeroize.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-zeroize.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-zeroize.git/commit/?id=4cb568d…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 4cb568d0507f6b3d720804145ec2eb76379d830c Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 15:08:13 2023 +0200 Update to version 1.6.0; Fixes RHBZ#2181927 diff --git a/README.md b/README.md deleted file mode 100644 index d9adcc5..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-zeroize - -The rust-zeroize package \ No newline at end of file diff --git a/rust-zeroize.spec b/rust-zeroize.spec index dfeabd1..fb46bbb 100644 --- a/rust-zeroize.spec +++ b/rust-zeroize.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate zeroize Name: rust-zeroize -Version: 1.5.7 +Version: 1.6.0 Release: %autorelease Summary: Securely clear secrets from memory @@ -13,15 +13,13 @@ License: Apache-2.0 OR MIT URL: https://crates.io/crates/zeroize Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Securely clear secrets from memory with a simple trait built on stable Rust -primitives which guarantee memory is zeroed using an operation will not be -'optimized away' by the compiler. Uses a portable pure Rust implementation that -works everywhere, even WASM!.} +Securely clear secrets from memory with a simple trait built on stable +Rust primitives which guarantee memory is zeroed using an operation will +not be 'optimized away' by the compiler. Uses a portable pure Rust +implementation that works everywhere, even WASM!.} %description %{_description} diff --git a/sources b/sources index 462fa57..b666719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeroize-1.5.7.crate) = e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9 +SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b commit 83094d47a2f1c83f583161f46831f1db22540745 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jan 21 02:28:25 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>

1 0

Architecture specific change in rpms/rust-zeroize.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-zeroize.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-zeroize.git/commit/?id=4cb568d…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 4cb568d0507f6b3d720804145ec2eb76379d830c Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 15:08:13 2023 +0200 Update to version 1.6.0; Fixes RHBZ#2181927 diff --git a/README.md b/README.md deleted file mode 100644 index d9adcc5..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-zeroize - -The rust-zeroize package \ No newline at end of file diff --git a/rust-zeroize.spec b/rust-zeroize.spec index dfeabd1..fb46bbb 100644 --- a/rust-zeroize.spec +++ b/rust-zeroize.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate zeroize Name: rust-zeroize -Version: 1.5.7 +Version: 1.6.0 Release: %autorelease Summary: Securely clear secrets from memory @@ -13,15 +13,13 @@ License: Apache-2.0 OR MIT URL: https://crates.io/crates/zeroize Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Securely clear secrets from memory with a simple trait built on stable Rust -primitives which guarantee memory is zeroed using an operation will not be -'optimized away' by the compiler. Uses a portable pure Rust implementation that -works everywhere, even WASM!.} +Securely clear secrets from memory with a simple trait built on stable +Rust primitives which guarantee memory is zeroed using an operation will +not be 'optimized away' by the compiler. Uses a portable pure Rust +implementation that works everywhere, even WASM!.} %description %{_description} diff --git a/sources b/sources index 462fa57..b666719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeroize-1.5.7.crate) = e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9 +SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b

1 0

Architecture specific change in rpms/rust-foreign-types-macros.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-foreign-types-macros.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-foreign-types-macros.git/commi…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 5711aa852d9107169daa3435d30c817220792bcd Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 14:48:29 2023 +0200 Update to version 0.2.3; Fixes RHBZ#2181899 diff --git a/.gitignore b/.gitignore index d3da690..7a611c7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /foreign-types-macros-0.2.1.crate /foreign-types-macros-0.2.2.crate +/foreign-types-macros-0.2.3.crate diff --git a/rust-foreign-types-macros.spec b/rust-foreign-types-macros.spec index e30b9f0..100eb86 100644 --- a/rust-foreign-types-macros.spec +++ b/rust-foreign-types-macros.spec @@ -1,25 +1,23 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate foreign-types-macros -Name: rust-%{crate} -Version: 0.2.2 +Name: rust-foreign-types-macros +Version: 0.2.3 Release: %autorelease Summary: Internal crate used by foreign-types # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/foreign-types-macros Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Internal crate used by foreign-types.} +An internal crate used by foreign-types.} %description %{_description} diff --git a/sources b/sources index ac33a2b..36abfbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (foreign-types-macros-0.2.2.crate) = b5ce7599bfa9342f7586dbc0c7124ad19d560afe75cfbd758eb17ebfe7ac8c7f8f5515c4b527df4e8bfe812a8ac9df1a921d40df6d0e6e371a0be3795a36da05 +SHA512 (foreign-types-macros-0.2.3.crate) = c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367 commit 05e185d6d0f3b8504c59e9aa548dd753f6697dc0 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jan 20 22:54:10 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> commit cdfa8989df64e9a425d6cd51a0b6619598030a68 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jul 23 04:08:52 2022 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>

1 0

Architecture specific change in rpms/rust-foreign-types-macros.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/rust-foreign-types-macros.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-foreign-types-macros.git/commi…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 5711aa852d9107169daa3435d30c817220792bcd Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Mar 30 14:48:29 2023 +0200 Update to version 0.2.3; Fixes RHBZ#2181899 diff --git a/.gitignore b/.gitignore index d3da690..7a611c7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /foreign-types-macros-0.2.1.crate /foreign-types-macros-0.2.2.crate +/foreign-types-macros-0.2.3.crate diff --git a/rust-foreign-types-macros.spec b/rust-foreign-types-macros.spec index e30b9f0..100eb86 100644 --- a/rust-foreign-types-macros.spec +++ b/rust-foreign-types-macros.spec @@ -1,25 +1,23 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate foreign-types-macros -Name: rust-%{crate} -Version: 0.2.2 +Name: rust-foreign-types-macros +Version: 0.2.3 Release: %autorelease Summary: Internal crate used by foreign-types # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/foreign-types-macros Source: %{crates_source} -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Internal crate used by foreign-types.} +An internal crate used by foreign-types.} %description %{_description} diff --git a/sources b/sources index ac33a2b..36abfbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (foreign-types-macros-0.2.2.crate) = b5ce7599bfa9342f7586dbc0c7124ad19d560afe75cfbd758eb17ebfe7ac8c7f8f5515c4b527df4e8bfe812a8ac9df1a921d40df6d0e6e371a0be3795a36da05 +SHA512 (foreign-types-macros-0.2.3.crate) = c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367 commit 05e185d6d0f3b8504c59e9aa548dd753f6697dc0 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jan 20 22:54:10 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>

1 0

Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/delve.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=0d79aa47916b2f… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=22020a0a5fc8bc… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=69a860540fb6b7… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=baf961b7b960dd… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=8ec56186bf0751… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=39cfa248f89aa6…. Change: +%ifarch x86_64 +ExcludeArch: armv7hl -ExcludeArch: armv7hl +ExcludeArch: armv7hl +ExcludeArch: i686 +ExclusiveArch: x86_64 Thanks. Full change: ============ commit 0d79aa47916b2f845b542a2f0931f307a1e0adf6 Author: Alejandro Sáez <asm(a)redhat.com> Date: Tue Mar 28 18:01:05 2023 +0200 Update to 1.20.1 diff --git a/.gitignore b/.gitignore index 9cdee55..47fe7fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/delve-1.2.0.tar.gz +/delve-1.20.1.tar.gz diff --git a/add_address_operator_for_go-dap_compatibility.patch b/add_address_operator_for_go-dap_compatibility.patch new file mode 100644 index 0000000..0a53590 --- /dev/null +++ b/add_address_operator_for_go-dap_compatibility.patch @@ -0,0 +1,25 @@ +From 53683491e6826bc13bf7f333e689daa62d90b12e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm(a)redhat.com> +Date: Tue, 21 Mar 2023 18:13:34 +0100 +Subject: [PATCH] Add address operator to make it compatible with go-dap 0.7.0 + +--- + service/dap/server.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/service/dap/server.go b/service/dap/server.go +index 07300295..3c953ddf 100644 +--- a/service/dap/server.go ++++ b/service/dap/server.go +@@ -1411,7 +1411,7 @@ func (s *Session) updateBreakpointsResponse(breakpoints []dap.Breakpoint, i int, + path := s.toClientPath(got.File) + breakpoints[i].Id = got.ID + breakpoints[i].Line = got.Line +- breakpoints[i].Source = dap.Source{Name: filepath.Base(path), Path: path} ++ breakpoints[i].Source = &dap.Source{Name: filepath.Base(path), Path: path} + } + } + +-- +2.39.2 + diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch deleted file mode 100644 index 4c12416..0000000 --- a/clean-empty-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Thu, 21 Feb 2019 12:15:37 -0800 -Subject: [PATCH] Documentation: Remove empty doc file - ---- - Documentation/usage/commands.md | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - delete mode 100644 Documentation/usage/commands.md - -diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md -deleted file mode 100644 -index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 --- -2.16.5 - diff --git a/delve.spec b/delve.spec index bf6dbd8..88a2adb 100644 --- a/delve.spec +++ b/delve.spec @@ -3,7 +3,7 @@ # https://github.com/go-delve/delve %global goipath github.com/go-delve/delve -Version: 1.2.0 +Version: 1.20.1 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -12,10 +12,13 @@ easy to invoke and easy to use. Chances are if you're using a debugger, things aren't going your way. With that in mind, Delve should stay out of your way as much as possible.} +# Currently Delve only supports x86_64 and aarch64 +%global golang_arches x86_64 aarch64 + %gometa Name: delve -Release: 2%{?dist} +Release: %autorelease Summary: A debugger for the Go programming language # Detected licences # - Expat License at 'LICENSE' @@ -23,92 +26,81 @@ License: MIT URL: %{gourl} Source0: %{gosource} -# Currently Delve only supports x86_64 -ExcludeArch: ppc64le -ExcludeArch: s390x -ExcludeArch: aarch64 -ExcludeArch: i686 -ExcludeArch: armv7hl - -Patch1: ./disable-default-compression-dwz-test.patch -Patch2: ./integration-test-symlinks.patch -Patch3: ./clean-empty-doc.patch - -BuildRequires: golang(github.com/cosiner/argv) -BuildRequires: golang(github.com/mattn/go-isatty) -BuildRequires: golang(github.com/peterh/liner) -BuildRequires: golang(github.com/pkg/profile) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(golang.org/x/arch/x86/x86asm) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(golang.org/x/sys/windows) -BuildRequires: golang(gopkg.in/yaml.v2) +# This dependencies are only in use in x86_64 +%ifarch x86_64 +BuildRequires: golang(github.com/cilium/ebpf) +BuildRequires: golang(github.com/cilium/ebpf/link) +BuildRequires: golang(github.com/cilium/ebpf/ringbuf) +%endif +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/creack/pty) +BuildRequires: golang(github.com/derekparker/trie) +BuildRequires: golang(github.com/go-delve/liner) +BuildRequires: golang(github.com/google/go-dap) +BuildRequires: golang(github.com/hashicorp/golang-lru/simplelru) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(github.com/spf13/cobra/doc) +BuildRequires: golang(golang.org/x/arch/arm64/arm64asm) +BuildRequires: golang(golang.org/x/arch/ppc64/ppc64asm) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/tools/go/packages) +BuildRequires: golang(gopkg.in/yaml.v2) +BuildRequires: golang(go.starlark.net/resolve) +BuildRequires: golang(go.starlark.net/starlark) +BuildRequires: golang(go.starlark.net/syntax) +BuildRequires: lsof +BuildRequires: git + +# This patch won't be necessary in future releases. +# It makes 1.20.1 compatible with go-dap 0.7 instead of 0.6. +Patch0001: add_address_operator_for_go-dap_compatibility.patch %description %{common_description} - -%package -n %{goname}-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{goname}-devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - %prep -%forgeautosetup -p1 - -rm -rf vendor/ +echo "=== Start prep ===" +%goprep +%patch -P 0001 -p1 +%generate_buildrequires +%go_generate_buildrequires %build -%gobuildroot -%gobuild -o _bin/dlv %{goipath}/cmd/dlv - +echo "=== Start build ===" +%gobuild -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv +echo "=== End build ===" %install -%goinstall -install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv - +%gopkginstall +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %if %{with check} %check export GO111MODULE=off export GOPATH=%{buildroot}/%{gopath}:%{gopath} - delvepath=%{buildroot}/%{gopath}/src/%{goipath} cp -r _fixtures $delvepath cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +cp -r pkg/proc/internal/ebpf $delvepath/pkg/proc/internal/ + pushd $delvepath -for d in $(go list ./... | grep -v cmd | grep -v scripts); do - %gotest ${d} -done -rm -rf $delvepath/_fixtures -rm -rf $delvepath/pkg/dwarf/line/_testdata +echo "=== Start tests ===" +%gotest $(go list ./... | awk '!/(cmd|scripts)/ {print $1}') +echo "=== End tests ===" +rm -rf $delvepath popd %endif - %files %license LICENSE %doc CONTRIBUTING.md CHANGELOG.md %doc Documentation/* %{_bindir}/dlv - -%files -n %{goname}-devel -f devel.file-list -%license LICENSE - - %changelog -* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 -- First package for Fedora +%autochangelog diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch deleted file mode 100644 index 244e4c8..0000000 --- a/disable-default-compression-dwz-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 13:26:18 -0800 -Subject: [PATCH] pkg/proc: Disable default compression on DWZ test - -When compression is applied by default running the DWZ tool on the -resulting binary will crash. - -The actual default compression code will look and see if compression -makes any difference and if so replace the normal `.debug_*` section -with `.zdebug_*`. This is why it may not have been hit before. On one of -my workstations I build with 1.12rc1 and no compression happens, but on -a Fedora VM I build and the binary results in compressed DWARF sections. - -Adding this flag will make this test more consistent overall. ---- - pkg/proc/test/support.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - if flags&BuildModePIE != 0 { - buildFlags = append(buildFlags, "-buildmode=pie") - } -+ if flags&EnableDWZCompression != 0 { -+ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") -+ } - if path != "" { - buildFlags = append(buildFlags, name+".go") - } --- -2.16.5 - diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch deleted file mode 100644 index 94e2545..0000000 --- a/integration-test-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 14:01:13 -0800 -Subject: [PATCH] service/test: Follow symlinks in integration tests - ---- - service/test/common_test.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/service/test/common_test.go b/service/test/common_test.go -index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 ---- a/service/test/common_test.go -+++ b/service/test/common_test.go -@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { - t.Fatal(err) - } - } -+ sympath, err := filepath.EvalSymlinks(fp) -+ if err == nil { -+ fp = strings.Replace(sympath, "\\", "/", -1) -+ } - return fp - } - --- -2.16.5 - diff --git a/sources b/sources index e33a23b..d113079 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e +SHA512 (delve-1.20.1.tar.gz) = e3edca19ce989f39e42f380ae6ff70c331f17e0233b2c6a4e1f68090de2ec16a5cb9dd9300ae780eb017d48bd3b9bef0758f53a3ff212e15265372c62d0e384b commit 22020a0a5fc8bcfe3d474e0ff87af377889a854d Author: Tomas Hrcka <thrcka(a)redhat.com> Date: Tue Mar 28 10:36:32 2023 +0200 Unretirement request: https://pagure.io/releng/issue/11359 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..688e00a --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# delve + +The delve package \ No newline at end of file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bf6dbd8 --- /dev/null +++ b/delve.spec @@ -0,0 +1,114 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 2%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 +ExcludeArch: armv7hl + +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgeautosetup -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 +- First package for Fedora diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 69a860540fb6b719639876ba5585d705a11a2caf Author: Miro Hrončok <miro(a)hroncok.cz> Date: Thu Dec 26 13:47:40 2019 +0100 Orphaned for 6+ weeks diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9cdee55..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/delve-1.2.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 688e00a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# delve - -The delve package \ No newline at end of file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch deleted file mode 100644 index 4c12416..0000000 --- a/clean-empty-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Thu, 21 Feb 2019 12:15:37 -0800 -Subject: [PATCH] Documentation: Remove empty doc file - ---- - Documentation/usage/commands.md | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - delete mode 100644 Documentation/usage/commands.md - -diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md -deleted file mode 100644 -index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 --- -2.16.5 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/delve.spec b/delve.spec deleted file mode 100644 index bf6dbd8..0000000 --- a/delve.spec +++ /dev/null @@ -1,114 +0,0 @@ -# Run tests in check section -%bcond_without check - -# https://github.com/go-delve/delve -%global goipath github.com/go-delve/delve -Version: 1.2.0 - -%global common_description %{expand: -Delve is a debugger for the Go programming language. The goal of the project -is to provide a simple, full featured debugging tool for Go. Delve should be -easy to invoke and easy to use. Chances are if you're using a debugger, things -aren't going your way. With that in mind, Delve should stay out of your way as -much as possible.} - -%gometa - -Name: delve -Release: 2%{?dist} -Summary: A debugger for the Go programming language -# Detected licences -# - Expat License at 'LICENSE' -License: MIT -URL: %{gourl} -Source0: %{gosource} - -# Currently Delve only supports x86_64 -ExcludeArch: ppc64le -ExcludeArch: s390x -ExcludeArch: aarch64 -ExcludeArch: i686 -ExcludeArch: armv7hl - -Patch1: ./disable-default-compression-dwz-test.patch -Patch2: ./integration-test-symlinks.patch -Patch3: ./clean-empty-doc.patch - -BuildRequires: golang(github.com/cosiner/argv) -BuildRequires: golang(github.com/mattn/go-isatty) -BuildRequires: golang(github.com/peterh/liner) -BuildRequires: golang(github.com/pkg/profile) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(golang.org/x/arch/x86/x86asm) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(golang.org/x/sys/windows) -BuildRequires: golang(gopkg.in/yaml.v2) - -%description -%{common_description} - - -%package -n %{goname}-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{goname}-devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - -%prep -%forgeautosetup -p1 - -rm -rf vendor/ - - -%build -%gobuildroot -%gobuild -o _bin/dlv %{goipath}/cmd/dlv - - -%install -%goinstall -install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv - - -%if %{with check} -%check -export GO111MODULE=off -export GOPATH=%{buildroot}/%{gopath}:%{gopath} - -delvepath=%{buildroot}/%{gopath}/src/%{goipath} -cp -r _fixtures $delvepath -cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line -pushd $delvepath -for d in $(go list ./... | grep -v cmd | grep -v scripts); do - %gotest ${d} -done -rm -rf $delvepath/_fixtures -rm -rf $delvepath/pkg/dwarf/line/_testdata -popd -%endif - - -%files -%license LICENSE -%doc CONTRIBUTING.md CHANGELOG.md -%doc Documentation/* -%{_bindir}/dlv - - -%files -n %{goname}-devel -f devel.file-list -%license LICENSE - - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 -- First package for Fedora diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch deleted file mode 100644 index 244e4c8..0000000 --- a/disable-default-compression-dwz-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 13:26:18 -0800 -Subject: [PATCH] pkg/proc: Disable default compression on DWZ test - -When compression is applied by default running the DWZ tool on the -resulting binary will crash. - -The actual default compression code will look and see if compression -makes any difference and if so replace the normal `.debug_*` section -with `.zdebug_*`. This is why it may not have been hit before. On one of -my workstations I build with 1.12rc1 and no compression happens, but on -a Fedora VM I build and the binary results in compressed DWARF sections. - -Adding this flag will make this test more consistent overall. ---- - pkg/proc/test/support.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - if flags&BuildModePIE != 0 { - buildFlags = append(buildFlags, "-buildmode=pie") - } -+ if flags&EnableDWZCompression != 0 { -+ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") -+ } - if path != "" { - buildFlags = append(buildFlags, name+".go") - } --- -2.16.5 - diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch deleted file mode 100644 index 94e2545..0000000 --- a/integration-test-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 14:01:13 -0800 -Subject: [PATCH] service/test: Follow symlinks in integration tests - ---- - service/test/common_test.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/service/test/common_test.go b/service/test/common_test.go -index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 ---- a/service/test/common_test.go -+++ b/service/test/common_test.go -@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { - t.Fatal(err) - } - } -+ sympath, err := filepath.EvalSymlinks(fp) -+ if err == nil { -+ fp = strings.Replace(sympath, "\\", "/", -1) -+ } - return fp - } - --- -2.16.5 - diff --git a/sources b/sources deleted file mode 100644 index e33a23b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 47cb1f1922eb303ea4a8e3b5c030be92972aa012 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jul 24 21:50:34 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/delve.spec b/delve.spec index f1b891c..bf6dbd8 100644 --- a/delve.spec +++ b/delve.spec @@ -15,7 +15,7 @@ much as possible.} %gometa Name: delve -Release: 1%{?dist} +Release: 2%{?dist} Summary: A debugger for the Go programming language # Detected licences # - Expat License at 'LICENSE' @@ -107,5 +107,8 @@ popd %changelog +* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora commit 866ba589069390e0eb52d68b391b5e1fd86d25b6 Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 26 16:02:11 2019 -0800 Use custom check section diff --git a/delve.spec b/delve.spec index 2b58de7..f1b891c 100644 --- a/delve.spec +++ b/delve.spec @@ -79,7 +79,19 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd %endif commit baf961b7b960dd8025602db8db4211423015e9ce Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:18:40 2019 -0800 Exclude armv7hl diff --git a/delve.spec b/delve.spec index ce5dade..2b58de7 100644 --- a/delve.spec +++ b/delve.spec @@ -28,6 +28,7 @@ ExcludeArch: ppc64le ExcludeArch: s390x ExcludeArch: aarch64 ExcludeArch: i686 +ExcludeArch: armv7hl Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 8ec56186bf07517e8266ed3bef02d5e3eea8bc84 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:09:57 2019 -0800 Exclude non-supported arches diff --git a/delve.spec b/delve.spec index b175ad4..ce5dade 100644 --- a/delve.spec +++ b/delve.spec @@ -22,7 +22,12 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} -ExclusiveArch: x86_64 + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 39cfa248f89aa69b377aede2ba07c76df8fe0552 Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 13:02:51 2019 -0800 Add ExclusiveArch diff --git a/delve.spec b/delve.spec index 8777d2e..b175ad4 100644 --- a/delve.spec +++ b/delve.spec @@ -22,6 +22,7 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} +ExclusiveArch: x86_64 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit c22c3edb1c567b0446b5788b77b8a9ea891f839b Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 12:54:49 2019 -0800 Add sources file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 43d2ad259c07bf87f266d97f27e3d744be14d950 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Feb 21 16:50:11 2019 -0800 Add patch to remove empty doc file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/delve.spec b/delve.spec index a8202df..8777d2e 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) commit 5ccb3d6f3f0b901a068ca41dc2c4e397f7a47270 Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:30:38 2019 -0800 Switch back to using gochecks diff --git a/delve.spec b/delve.spec index 82a4361..a8202df 100644 --- a/delve.spec +++ b/delve.spec @@ -71,17 +71,7 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -# Copy to $GOPATH since modules aren't supported. -export GOPATH=%{gopath} -export GO111MODULE=off -mkdir -p %{gopath}/src/$(dirname %{goipath}) -ln -s $(pwd)/. %{gopath}/src/%{goipath} -cd %{gopath}/src/%{goipath} -for i in $(go list ./... | grep -v scripts | grep -v cmd); do - pushd .${i##%{goipath}} - %{gotest} - popd -done +%gochecks %endif commit 6a24acf8d595cc52f18ca8eac331f8caae22e0bc Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:10:25 2019 -0800 Fix spec file and patch tests to run in package build diff --git a/delve.spec b/delve.spec index 0b40524..82a4361 100644 --- a/delve.spec +++ b/delve.spec @@ -23,6 +23,9 @@ License: MIT URL: %{gourl} Source0: %{gosource} +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch + BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -68,7 +71,17 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +# Copy to $GOPATH since modules aren't supported. +export GOPATH=%{gopath} +export GO111MODULE=off +mkdir -p %{gopath}/src/$(dirname %{goipath}) +ln -s $(pwd)/. %{gopath}/src/%{goipath} +cd %{gopath}/src/%{goipath} +for i in $(go list ./... | grep -v scripts | grep -v cmd); do + pushd .${i##%{goipath}} + %{gotest} + popd +done %endif diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + commit c3ae28ead26d7fa3af8c3f1d221dbc44acc8a4fb Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 19 11:50:30 2019 -0800 Update spec for v1.2.0 diff --git a/delve.spec b/delve.spec index 46d6ce3..0b40524 100644 --- a/delve.spec +++ b/delve.spec @@ -1,9 +1,9 @@ # Run tests in check section %bcond_without check -# https://github.com/derekparker/delve -%global goipath github.com/derekparker/delve -Version: 1.1.0 +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -23,10 +23,6 @@ License: MIT URL: %{gourl} Source0: %{gosource} -Patch1: ./eval-symlink-in-test.patch -Patch2: ./test-fixture-vendor-to-internal.patch -Patch3: ./doc-location.patch - BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -88,5 +84,5 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %changelog -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora diff --git a/doc-location.patch b/doc-location.patch deleted file mode 100644 index 79a5f46..0000000 --- a/doc-location.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Mon, 4 Feb 2019 01:49:43 -0800 -Subject: [PATCH] Update doc location for RPM package - ---- - pkg/terminal/command.go | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go -index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 ---- a/pkg/terminal/command.go -+++ b/pkg/terminal/command.go -@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, - - break [name] <linespec> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. - - trace [name] <linespec> - --A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. -@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. - - [goroutine <n>] [frame <m>] print <expression> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, - {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. - - whatis <expression>.`}, -@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des - - [goroutine <n>] [frame <m>] set <variable> = <value> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, - {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. - - sources [<regex>] --- -2.16.5 - diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch deleted file mode 100644 index 58aa079..0000000 --- a/eval-symlink-in-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 -From: Derek Parker <parkerderek86(a)gmail.com> -Date: Fri, 4 Jan 2019 02:03:16 -0800 -Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) - -Some build environments (such as when building RPMs) enjoy symlinking -things. This unfortunately causes our tests to fail as we record the -path of fixtures and use that when looking up file:line information. -However, the debug info in the binary records the original file -location, not the location of the symlink. ---- - pkg/proc/test/support.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 733bad85..5f4a4127 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - - source, _ := filepath.Abs(path) - source = filepath.ToSlash(source) -+ sympath, err := filepath.EvalSymlinks(source) -+ if err == nil { -+ source = strings.Replace(sympath, "\\", "/", -1) -+ } - - fixture := Fixture{Name: name, Path: tmpfile, Source: source} - diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch deleted file mode 100644 index 774de87..0000000 --- a/test-fixture-vendor-to-internal.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 -From: aarzilli <alessandro.arzilli(a)gmail.com> -Date: Tue, 6 Nov 2018 12:11:51 +0100 -Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal - -Some tests used a fake vendor directory placed inside _fixtures to -import some support packages. -In go.mod mode vendor directory are only supported on the root of the -project, which breaks some of our tests. -Since vendor directories outside the root of the project are so rare -anyway it's possible that a future version of go will stop supporting -it even in GOPATH mode. -Also it was weird and unnecessary in the first place anyawy. ---- - _fixtures/consts.go | 2 +- - _fixtures/dotpackagesiface.go | 4 ++-- - _fixtures/{vendor => internal}/dir.io/dir.go | 0 - .../{vendor => internal}/dir.io/io.io/io.go | 0 - .../{vendor => internal}/dir0/pkg/main.go | 0 - .../dir0/renamedpackage/main.go | 0 - .../{vendor => internal}/dir1/pkg/main.go | 0 - _fixtures/pkgrenames.go | 6 ++--- - service/test/variables_test.go | 24 +++++++++---------- - 9 files changed, 18 insertions(+), 18 deletions(-) - rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) - rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) - rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) - rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) - rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) - -diff --git a/_fixtures/consts.go b/_fixtures/consts.go -index 531a27db..54bfa8b2 100644 ---- a/_fixtures/consts.go -+++ b/_fixtures/consts.go -@@ -1,8 +1,8 @@ - package main - - import ( -- "dir0/pkg" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" - "runtime" - ) - -diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go -index 5ad147c2..5952ebeb 100644 ---- a/_fixtures/dotpackagesiface.go -+++ b/_fixtures/dotpackagesiface.go -@@ -1,9 +1,9 @@ - package main - - import ( -- "dir.io" -- "dir.io/io.io" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" - "runtime" - ) - -diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go -similarity index 100% -rename from _fixtures/vendor/dir.io/dir.go -rename to _fixtures/internal/dir.io/dir.go -diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go -similarity index 100% -rename from _fixtures/vendor/dir.io/io.io/io.go -rename to _fixtures/internal/dir.io/io.io/io.go -diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/pkg/main.go -rename to _fixtures/internal/dir0/pkg/main.go -diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/renamedpackage/main.go -rename to _fixtures/internal/dir0/renamedpackage/main.go -diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir1/pkg/main.go -rename to _fixtures/internal/dir1/pkg/main.go -diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go -index d315e6b7..6e0882dc 100644 ---- a/_fixtures/pkgrenames.go -+++ b/_fixtures/pkgrenames.go -@@ -8,9 +8,9 @@ import ( - pkg1 "go/ast" - pkg2 "net/http" - -- "dir0/pkg" -- "dir0/renamedpackage" -- dir1pkg "dir1/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" -+ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" - ) - - func main() { -diff --git a/service/test/variables_test.go b/service/test/variables_test.go -index 83fb6e7a..0e29202a 100644 ---- a/service/test/variables_test.go -+++ b/service/test/variables_test.go -@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { - {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, - - // Package name that doesn't match import path -- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, -+ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, - - // Interfaces to anonymous types - {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, -- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, -+ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -+ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -+ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -+ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -+ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -+ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -+ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -+ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -+ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -+ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, - - {`"dir0/pkg".A`, false, "0", "", "int", nil}, - {`"dir1/pkg".A`, false, "1", "", "int", nil}, -@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { - if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { - // before 1.9 embedded struct field have fieldname == type - if tc.name == "astruct2" { -- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` -+ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` - } - } - variable, err := evalVariable(p, tc.name, pnormalLoadConfig) commit da74eae497435bb41a624c5c4f15876502585917 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 4 01:52:04 2019 -0800 Update doc location output, cleanup spec diff --git a/delve.spec b/delve.spec index bddcced..46d6ce3 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./eval-symlink-in-test.patch Patch2: ./test-fixture-vendor-to-internal.patch +Patch3: ./doc-location.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) @@ -54,10 +55,7 @@ building other packages which use import path with %prep -%forgesetup - -%patch1 -p1 -%patch2 -p1 +%forgeautosetup -p1 rm -rf vendor/ diff --git a/doc-location.patch b/doc-location.patch new file mode 100644 index 0000000..79a5f46 --- /dev/null +++ b/doc-location.patch @@ -0,0 +1,51 @@ +From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Mon, 4 Feb 2019 01:49:43 -0800 +Subject: [PATCH] Update doc location for RPM package + +--- + pkg/terminal/command.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go +index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 +--- a/pkg/terminal/command.go ++++ b/pkg/terminal/command.go +@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, + + break [name] <linespec> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. + + trace [name] <linespec> + +-A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. +@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. + + [goroutine <n>] [frame <m>] print <expression> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, + {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. + + whatis <expression>.`}, +@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des + + [goroutine <n>] [frame <m>] set <variable> = <value> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, + {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. + + sources [<regex>] +-- +2.16.5 + commit 1881006b0f0a31290a6d11aeb4228e1d6e2da1c0 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Nov 1 13:37:02 2018 -0700 Initial spec file diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bddcced --- /dev/null +++ b/delve.spec @@ -0,0 +1,94 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/derekparker/delve +%global goipath github.com/derekparker/delve +Version: 1.1.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 1%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +Patch1: ./eval-symlink-in-test.patch +Patch2: ./test-fixture-vendor-to-internal.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgesetup + +%patch1 -p1 +%patch2 -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +%gochecks +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +- First package for Fedora diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch new file mode 100644 index 0000000..58aa079 --- /dev/null +++ b/eval-symlink-in-test.patch @@ -0,0 +1,29 @@ +From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 +From: Derek Parker <parkerderek86(a)gmail.com> +Date: Fri, 4 Jan 2019 02:03:16 -0800 +Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) + +Some build environments (such as when building RPMs) enjoy symlinking +things. This unfortunately causes our tests to fail as we record the +path of fixtures and use that when looking up file:line information. +However, the debug info in the binary records the original file +location, not the location of the symlink. +--- + pkg/proc/test/support.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 733bad85..5f4a4127 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + + source, _ := filepath.Abs(path) + source = filepath.ToSlash(source) ++ sympath, err := filepath.EvalSymlinks(source) ++ if err == nil { ++ source = strings.Replace(sympath, "\\", "/", -1) ++ } + + fixture := Fixture{Name: name, Path: tmpfile, Source: source} + diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch new file mode 100644 index 0000000..774de87 --- /dev/null +++ b/test-fixture-vendor-to-internal.patch @@ -0,0 +1,142 @@ +From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 +From: aarzilli <alessandro.arzilli(a)gmail.com> +Date: Tue, 6 Nov 2018 12:11:51 +0100 +Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal + +Some tests used a fake vendor directory placed inside _fixtures to +import some support packages. +In go.mod mode vendor directory are only supported on the root of the +project, which breaks some of our tests. +Since vendor directories outside the root of the project are so rare +anyway it's possible that a future version of go will stop supporting +it even in GOPATH mode. +Also it was weird and unnecessary in the first place anyawy. +--- + _fixtures/consts.go | 2 +- + _fixtures/dotpackagesiface.go | 4 ++-- + _fixtures/{vendor => internal}/dir.io/dir.go | 0 + .../{vendor => internal}/dir.io/io.io/io.go | 0 + .../{vendor => internal}/dir0/pkg/main.go | 0 + .../dir0/renamedpackage/main.go | 0 + .../{vendor => internal}/dir1/pkg/main.go | 0 + _fixtures/pkgrenames.go | 6 ++--- + service/test/variables_test.go | 24 +++++++++---------- + 9 files changed, 18 insertions(+), 18 deletions(-) + rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) + rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) + rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) + rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) + rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) + +diff --git a/_fixtures/consts.go b/_fixtures/consts.go +index 531a27db..54bfa8b2 100644 +--- a/_fixtures/consts.go ++++ b/_fixtures/consts.go +@@ -1,8 +1,8 @@ + package main + + import ( +- "dir0/pkg" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" + "runtime" + ) + +diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go +index 5ad147c2..5952ebeb 100644 +--- a/_fixtures/dotpackagesiface.go ++++ b/_fixtures/dotpackagesiface.go +@@ -1,9 +1,9 @@ + package main + + import ( +- "dir.io" +- "dir.io/io.io" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" + "runtime" + ) + +diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go +similarity index 100% +rename from _fixtures/vendor/dir.io/dir.go +rename to _fixtures/internal/dir.io/dir.go +diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go +similarity index 100% +rename from _fixtures/vendor/dir.io/io.io/io.go +rename to _fixtures/internal/dir.io/io.io/io.go +diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/pkg/main.go +rename to _fixtures/internal/dir0/pkg/main.go +diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/renamedpackage/main.go +rename to _fixtures/internal/dir0/renamedpackage/main.go +diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir1/pkg/main.go +rename to _fixtures/internal/dir1/pkg/main.go +diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go +index d315e6b7..6e0882dc 100644 +--- a/_fixtures/pkgrenames.go ++++ b/_fixtures/pkgrenames.go +@@ -8,9 +8,9 @@ import ( + pkg1 "go/ast" + pkg2 "net/http" + +- "dir0/pkg" +- "dir0/renamedpackage" +- dir1pkg "dir1/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" ++ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" + ) + + func main() { +diff --git a/service/test/variables_test.go b/service/test/variables_test.go +index 83fb6e7a..0e29202a 100644 +--- a/service/test/variables_test.go ++++ b/service/test/variables_test.go +@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { + {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, + + // Package name that doesn't match import path +- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, ++ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, + + // Interfaces to anonymous types + {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, +- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, +- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, +- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, +- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, +- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, +- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, +- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, +- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, +- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, +- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, ++ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, ++ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, ++ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, ++ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, ++ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, ++ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, ++ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, ++ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, ++ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, ++ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, + + {`"dir0/pkg".A`, false, "0", "", "int", nil}, + {`"dir1/pkg".A`, false, "1", "", "int", nil}, +@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { + if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { + // before 1.9 embedded struct field have fieldname == type + if tc.name == "astruct2" { +- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` ++ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` + } + } + variable, err := evalVariable(p, tc.name, pnormalLoadConfig)

1 0

Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org 30 Mar '23

30 Mar '23

The package rpms/delve.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=0d79aa47916b2f… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=22020a0a5fc8bc… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=69a860540fb6b7… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=baf961b7b960dd… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=8ec56186bf0751… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=39cfa248f89aa6…. Change: +%ifarch x86_64 +ExcludeArch: armv7hl -ExcludeArch: armv7hl +ExcludeArch: armv7hl +ExcludeArch: i686 +ExclusiveArch: x86_64 Thanks. Full change: ============ commit 0d79aa47916b2f845b542a2f0931f307a1e0adf6 Author: Alejandro Sáez <asm(a)redhat.com> Date: Tue Mar 28 18:01:05 2023 +0200 Update to 1.20.1 diff --git a/.gitignore b/.gitignore index 9cdee55..47fe7fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/delve-1.2.0.tar.gz +/delve-1.20.1.tar.gz diff --git a/add_address_operator_for_go-dap_compatibility.patch b/add_address_operator_for_go-dap_compatibility.patch new file mode 100644 index 0000000..0a53590 --- /dev/null +++ b/add_address_operator_for_go-dap_compatibility.patch @@ -0,0 +1,25 @@ +From 53683491e6826bc13bf7f333e689daa62d90b12e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm(a)redhat.com> +Date: Tue, 21 Mar 2023 18:13:34 +0100 +Subject: [PATCH] Add address operator to make it compatible with go-dap 0.7.0 + +--- + service/dap/server.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/service/dap/server.go b/service/dap/server.go +index 07300295..3c953ddf 100644 +--- a/service/dap/server.go ++++ b/service/dap/server.go +@@ -1411,7 +1411,7 @@ func (s *Session) updateBreakpointsResponse(breakpoints []dap.Breakpoint, i int, + path := s.toClientPath(got.File) + breakpoints[i].Id = got.ID + breakpoints[i].Line = got.Line +- breakpoints[i].Source = dap.Source{Name: filepath.Base(path), Path: path} ++ breakpoints[i].Source = &dap.Source{Name: filepath.Base(path), Path: path} + } + } + +-- +2.39.2 + diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch deleted file mode 100644 index 4c12416..0000000 --- a/clean-empty-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Thu, 21 Feb 2019 12:15:37 -0800 -Subject: [PATCH] Documentation: Remove empty doc file - ---- - Documentation/usage/commands.md | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - delete mode 100644 Documentation/usage/commands.md - -diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md -deleted file mode 100644 -index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 --- -2.16.5 - diff --git a/delve.spec b/delve.spec index bf6dbd8..88a2adb 100644 --- a/delve.spec +++ b/delve.spec @@ -3,7 +3,7 @@ # https://github.com/go-delve/delve %global goipath github.com/go-delve/delve -Version: 1.2.0 +Version: 1.20.1 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -12,10 +12,13 @@ easy to invoke and easy to use. Chances are if you're using a debugger, things aren't going your way. With that in mind, Delve should stay out of your way as much as possible.} +# Currently Delve only supports x86_64 and aarch64 +%global golang_arches x86_64 aarch64 + %gometa Name: delve -Release: 2%{?dist} +Release: %autorelease Summary: A debugger for the Go programming language # Detected licences # - Expat License at 'LICENSE' @@ -23,92 +26,81 @@ License: MIT URL: %{gourl} Source0: %{gosource} -# Currently Delve only supports x86_64 -ExcludeArch: ppc64le -ExcludeArch: s390x -ExcludeArch: aarch64 -ExcludeArch: i686 -ExcludeArch: armv7hl - -Patch1: ./disable-default-compression-dwz-test.patch -Patch2: ./integration-test-symlinks.patch -Patch3: ./clean-empty-doc.patch - -BuildRequires: golang(github.com/cosiner/argv) -BuildRequires: golang(github.com/mattn/go-isatty) -BuildRequires: golang(github.com/peterh/liner) -BuildRequires: golang(github.com/pkg/profile) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(golang.org/x/arch/x86/x86asm) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(golang.org/x/sys/windows) -BuildRequires: golang(gopkg.in/yaml.v2) +# This dependencies are only in use in x86_64 +%ifarch x86_64 +BuildRequires: golang(github.com/cilium/ebpf) +BuildRequires: golang(github.com/cilium/ebpf/link) +BuildRequires: golang(github.com/cilium/ebpf/ringbuf) +%endif +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/creack/pty) +BuildRequires: golang(github.com/derekparker/trie) +BuildRequires: golang(github.com/go-delve/liner) +BuildRequires: golang(github.com/google/go-dap) +BuildRequires: golang(github.com/hashicorp/golang-lru/simplelru) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(github.com/spf13/cobra/doc) +BuildRequires: golang(golang.org/x/arch/arm64/arm64asm) +BuildRequires: golang(golang.org/x/arch/ppc64/ppc64asm) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/tools/go/packages) +BuildRequires: golang(gopkg.in/yaml.v2) +BuildRequires: golang(go.starlark.net/resolve) +BuildRequires: golang(go.starlark.net/starlark) +BuildRequires: golang(go.starlark.net/syntax) +BuildRequires: lsof +BuildRequires: git + +# This patch won't be necessary in future releases. +# It makes 1.20.1 compatible with go-dap 0.7 instead of 0.6. +Patch0001: add_address_operator_for_go-dap_compatibility.patch %description %{common_description} - -%package -n %{goname}-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{goname}-devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - %prep -%forgeautosetup -p1 - -rm -rf vendor/ +echo "=== Start prep ===" +%goprep +%patch -P 0001 -p1 +%generate_buildrequires +%go_generate_buildrequires %build -%gobuildroot -%gobuild -o _bin/dlv %{goipath}/cmd/dlv - +echo "=== Start build ===" +%gobuild -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv +echo "=== End build ===" %install -%goinstall -install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv - +%gopkginstall +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %if %{with check} %check export GO111MODULE=off export GOPATH=%{buildroot}/%{gopath}:%{gopath} - delvepath=%{buildroot}/%{gopath}/src/%{goipath} cp -r _fixtures $delvepath cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +cp -r pkg/proc/internal/ebpf $delvepath/pkg/proc/internal/ + pushd $delvepath -for d in $(go list ./... | grep -v cmd | grep -v scripts); do - %gotest ${d} -done -rm -rf $delvepath/_fixtures -rm -rf $delvepath/pkg/dwarf/line/_testdata +echo "=== Start tests ===" +%gotest $(go list ./... | awk '!/(cmd|scripts)/ {print $1}') +echo "=== End tests ===" +rm -rf $delvepath popd %endif - %files %license LICENSE %doc CONTRIBUTING.md CHANGELOG.md %doc Documentation/* %{_bindir}/dlv - -%files -n %{goname}-devel -f devel.file-list -%license LICENSE - - %changelog -* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 -- First package for Fedora +%autochangelog diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch deleted file mode 100644 index 244e4c8..0000000 --- a/disable-default-compression-dwz-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 13:26:18 -0800 -Subject: [PATCH] pkg/proc: Disable default compression on DWZ test - -When compression is applied by default running the DWZ tool on the -resulting binary will crash. - -The actual default compression code will look and see if compression -makes any difference and if so replace the normal `.debug_*` section -with `.zdebug_*`. This is why it may not have been hit before. On one of -my workstations I build with 1.12rc1 and no compression happens, but on -a Fedora VM I build and the binary results in compressed DWARF sections. - -Adding this flag will make this test more consistent overall. ---- - pkg/proc/test/support.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - if flags&BuildModePIE != 0 { - buildFlags = append(buildFlags, "-buildmode=pie") - } -+ if flags&EnableDWZCompression != 0 { -+ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") -+ } - if path != "" { - buildFlags = append(buildFlags, name+".go") - } --- -2.16.5 - diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch deleted file mode 100644 index 94e2545..0000000 --- a/integration-test-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 14:01:13 -0800 -Subject: [PATCH] service/test: Follow symlinks in integration tests - ---- - service/test/common_test.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/service/test/common_test.go b/service/test/common_test.go -index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 ---- a/service/test/common_test.go -+++ b/service/test/common_test.go -@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { - t.Fatal(err) - } - } -+ sympath, err := filepath.EvalSymlinks(fp) -+ if err == nil { -+ fp = strings.Replace(sympath, "\\", "/", -1) -+ } - return fp - } - --- -2.16.5 - diff --git a/sources b/sources index e33a23b..d113079 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e +SHA512 (delve-1.20.1.tar.gz) = e3edca19ce989f39e42f380ae6ff70c331f17e0233b2c6a4e1f68090de2ec16a5cb9dd9300ae780eb017d48bd3b9bef0758f53a3ff212e15265372c62d0e384b commit 22020a0a5fc8bcfe3d474e0ff87af377889a854d Author: Tomas Hrcka <thrcka(a)redhat.com> Date: Tue Mar 28 10:36:32 2023 +0200 Unretirement request: https://pagure.io/releng/issue/11359 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..688e00a --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# delve + +The delve package \ No newline at end of file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bf6dbd8 --- /dev/null +++ b/delve.spec @@ -0,0 +1,114 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 2%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 +ExcludeArch: armv7hl + +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgeautosetup -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 +- First package for Fedora diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 69a860540fb6b719639876ba5585d705a11a2caf Author: Miro Hrončok <miro(a)hroncok.cz> Date: Thu Dec 26 13:47:40 2019 +0100 Orphaned for 6+ weeks diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9cdee55..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/delve-1.2.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 688e00a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# delve - -The delve package \ No newline at end of file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch deleted file mode 100644 index 4c12416..0000000 --- a/clean-empty-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ -From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Thu, 21 Feb 2019 12:15:37 -0800 -Subject: [PATCH] Documentation: Remove empty doc file - ---- - Documentation/usage/commands.md | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - delete mode 100644 Documentation/usage/commands.md - -diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md -deleted file mode 100644 -index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 --- -2.16.5 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/delve.spec b/delve.spec deleted file mode 100644 index bf6dbd8..0000000 --- a/delve.spec +++ /dev/null @@ -1,114 +0,0 @@ -# Run tests in check section -%bcond_without check - -# https://github.com/go-delve/delve -%global goipath github.com/go-delve/delve -Version: 1.2.0 - -%global common_description %{expand: -Delve is a debugger for the Go programming language. The goal of the project -is to provide a simple, full featured debugging tool for Go. Delve should be -easy to invoke and easy to use. Chances are if you're using a debugger, things -aren't going your way. With that in mind, Delve should stay out of your way as -much as possible.} - -%gometa - -Name: delve -Release: 2%{?dist} -Summary: A debugger for the Go programming language -# Detected licences -# - Expat License at 'LICENSE' -License: MIT -URL: %{gourl} -Source0: %{gosource} - -# Currently Delve only supports x86_64 -ExcludeArch: ppc64le -ExcludeArch: s390x -ExcludeArch: aarch64 -ExcludeArch: i686 -ExcludeArch: armv7hl - -Patch1: ./disable-default-compression-dwz-test.patch -Patch2: ./integration-test-symlinks.patch -Patch3: ./clean-empty-doc.patch - -BuildRequires: golang(github.com/cosiner/argv) -BuildRequires: golang(github.com/mattn/go-isatty) -BuildRequires: golang(github.com/peterh/liner) -BuildRequires: golang(github.com/pkg/profile) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(golang.org/x/arch/x86/x86asm) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(golang.org/x/sys/windows) -BuildRequires: golang(gopkg.in/yaml.v2) - -%description -%{common_description} - - -%package -n %{goname}-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{goname}-devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - -%prep -%forgeautosetup -p1 - -rm -rf vendor/ - - -%build -%gobuildroot -%gobuild -o _bin/dlv %{goipath}/cmd/dlv - - -%install -%goinstall -install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv - - -%if %{with check} -%check -export GO111MODULE=off -export GOPATH=%{buildroot}/%{gopath}:%{gopath} - -delvepath=%{buildroot}/%{gopath}/src/%{goipath} -cp -r _fixtures $delvepath -cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line -pushd $delvepath -for d in $(go list ./... | grep -v cmd | grep -v scripts); do - %gotest ${d} -done -rm -rf $delvepath/_fixtures -rm -rf $delvepath/pkg/dwarf/line/_testdata -popd -%endif - - -%files -%license LICENSE -%doc CONTRIBUTING.md CHANGELOG.md -%doc Documentation/* -%{_bindir}/dlv - - -%files -n %{goname}-devel -f devel.file-list -%license LICENSE - - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 -- First package for Fedora diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch deleted file mode 100644 index 244e4c8..0000000 --- a/disable-default-compression-dwz-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 13:26:18 -0800 -Subject: [PATCH] pkg/proc: Disable default compression on DWZ test - -When compression is applied by default running the DWZ tool on the -resulting binary will crash. - -The actual default compression code will look and see if compression -makes any difference and if so replace the normal `.debug_*` section -with `.zdebug_*`. This is why it may not have been hit before. On one of -my workstations I build with 1.12rc1 and no compression happens, but on -a Fedora VM I build and the binary results in compressed DWARF sections. - -Adding this flag will make this test more consistent overall. ---- - pkg/proc/test/support.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - if flags&BuildModePIE != 0 { - buildFlags = append(buildFlags, "-buildmode=pie") - } -+ if flags&EnableDWZCompression != 0 { -+ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") -+ } - if path != "" { - buildFlags = append(buildFlags, name+".go") - } --- -2.16.5 - diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch deleted file mode 100644 index 94e2545..0000000 --- a/integration-test-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Wed, 20 Feb 2019 14:01:13 -0800 -Subject: [PATCH] service/test: Follow symlinks in integration tests - ---- - service/test/common_test.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/service/test/common_test.go b/service/test/common_test.go -index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 ---- a/service/test/common_test.go -+++ b/service/test/common_test.go -@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { - t.Fatal(err) - } - } -+ sympath, err := filepath.EvalSymlinks(fp) -+ if err == nil { -+ fp = strings.Replace(sympath, "\\", "/", -1) -+ } - return fp - } - --- -2.16.5 - diff --git a/sources b/sources deleted file mode 100644 index e33a23b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 47cb1f1922eb303ea4a8e3b5c030be92972aa012 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jul 24 21:50:34 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/delve.spec b/delve.spec index f1b891c..bf6dbd8 100644 --- a/delve.spec +++ b/delve.spec @@ -15,7 +15,7 @@ much as possible.} %gometa Name: delve -Release: 1%{?dist} +Release: 2%{?dist} Summary: A debugger for the Go programming language # Detected licences # - Expat License at 'LICENSE' @@ -107,5 +107,8 @@ popd %changelog +* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora commit 866ba589069390e0eb52d68b391b5e1fd86d25b6 Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 26 16:02:11 2019 -0800 Use custom check section diff --git a/delve.spec b/delve.spec index 2b58de7..f1b891c 100644 --- a/delve.spec +++ b/delve.spec @@ -79,7 +79,19 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd %endif commit baf961b7b960dd8025602db8db4211423015e9ce Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:18:40 2019 -0800 Exclude armv7hl diff --git a/delve.spec b/delve.spec index ce5dade..2b58de7 100644 --- a/delve.spec +++ b/delve.spec @@ -28,6 +28,7 @@ ExcludeArch: ppc64le ExcludeArch: s390x ExcludeArch: aarch64 ExcludeArch: i686 +ExcludeArch: armv7hl Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 8ec56186bf07517e8266ed3bef02d5e3eea8bc84 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:09:57 2019 -0800 Exclude non-supported arches diff --git a/delve.spec b/delve.spec index b175ad4..ce5dade 100644 --- a/delve.spec +++ b/delve.spec @@ -22,7 +22,12 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} -ExclusiveArch: x86_64 + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 39cfa248f89aa69b377aede2ba07c76df8fe0552 Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 13:02:51 2019 -0800 Add ExclusiveArch diff --git a/delve.spec b/delve.spec index 8777d2e..b175ad4 100644 --- a/delve.spec +++ b/delve.spec @@ -22,6 +22,7 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} +ExclusiveArch: x86_64 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit c22c3edb1c567b0446b5788b77b8a9ea891f839b Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 12:54:49 2019 -0800 Add sources file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 43d2ad259c07bf87f266d97f27e3d744be14d950 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Feb 21 16:50:11 2019 -0800 Add patch to remove empty doc file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/delve.spec b/delve.spec index a8202df..8777d2e 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) commit 5ccb3d6f3f0b901a068ca41dc2c4e397f7a47270 Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:30:38 2019 -0800 Switch back to using gochecks diff --git a/delve.spec b/delve.spec index 82a4361..a8202df 100644 --- a/delve.spec +++ b/delve.spec @@ -71,17 +71,7 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -# Copy to $GOPATH since modules aren't supported. -export GOPATH=%{gopath} -export GO111MODULE=off -mkdir -p %{gopath}/src/$(dirname %{goipath}) -ln -s $(pwd)/. %{gopath}/src/%{goipath} -cd %{gopath}/src/%{goipath} -for i in $(go list ./... | grep -v scripts | grep -v cmd); do - pushd .${i##%{goipath}} - %{gotest} - popd -done +%gochecks %endif commit 6a24acf8d595cc52f18ca8eac331f8caae22e0bc Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:10:25 2019 -0800 Fix spec file and patch tests to run in package build diff --git a/delve.spec b/delve.spec index 0b40524..82a4361 100644 --- a/delve.spec +++ b/delve.spec @@ -23,6 +23,9 @@ License: MIT URL: %{gourl} Source0: %{gosource} +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch + BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -68,7 +71,17 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +# Copy to $GOPATH since modules aren't supported. +export GOPATH=%{gopath} +export GO111MODULE=off +mkdir -p %{gopath}/src/$(dirname %{goipath}) +ln -s $(pwd)/. %{gopath}/src/%{goipath} +cd %{gopath}/src/%{goipath} +for i in $(go list ./... | grep -v scripts | grep -v cmd); do + pushd .${i##%{goipath}} + %{gotest} + popd +done %endif diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + commit c3ae28ead26d7fa3af8c3f1d221dbc44acc8a4fb Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 19 11:50:30 2019 -0800 Update spec for v1.2.0 diff --git a/delve.spec b/delve.spec index 46d6ce3..0b40524 100644 --- a/delve.spec +++ b/delve.spec @@ -1,9 +1,9 @@ # Run tests in check section %bcond_without check -# https://github.com/derekparker/delve -%global goipath github.com/derekparker/delve -Version: 1.1.0 +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -23,10 +23,6 @@ License: MIT URL: %{gourl} Source0: %{gosource} -Patch1: ./eval-symlink-in-test.patch -Patch2: ./test-fixture-vendor-to-internal.patch -Patch3: ./doc-location.patch - BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -88,5 +84,5 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %changelog -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora diff --git a/doc-location.patch b/doc-location.patch deleted file mode 100644 index 79a5f46..0000000 --- a/doc-location.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Mon, 4 Feb 2019 01:49:43 -0800 -Subject: [PATCH] Update doc location for RPM package - ---- - pkg/terminal/command.go | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go -index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 ---- a/pkg/terminal/command.go -+++ b/pkg/terminal/command.go -@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, - - break [name] <linespec> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. - - trace [name] <linespec> - --A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. -@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. - - [goroutine <n>] [frame <m>] print <expression> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, - {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. - - whatis <expression>.`}, -@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des - - [goroutine <n>] [frame <m>] set <variable> = <value> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, - {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. - - sources [<regex>] --- -2.16.5 - diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch deleted file mode 100644 index 58aa079..0000000 --- a/eval-symlink-in-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 -From: Derek Parker <parkerderek86(a)gmail.com> -Date: Fri, 4 Jan 2019 02:03:16 -0800 -Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) - -Some build environments (such as when building RPMs) enjoy symlinking -things. This unfortunately causes our tests to fail as we record the -path of fixtures and use that when looking up file:line information. -However, the debug info in the binary records the original file -location, not the location of the symlink. ---- - pkg/proc/test/support.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 733bad85..5f4a4127 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - - source, _ := filepath.Abs(path) - source = filepath.ToSlash(source) -+ sympath, err := filepath.EvalSymlinks(source) -+ if err == nil { -+ source = strings.Replace(sympath, "\\", "/", -1) -+ } - - fixture := Fixture{Name: name, Path: tmpfile, Source: source} - diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch deleted file mode 100644 index 774de87..0000000 --- a/test-fixture-vendor-to-internal.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 -From: aarzilli <alessandro.arzilli(a)gmail.com> -Date: Tue, 6 Nov 2018 12:11:51 +0100 -Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal - -Some tests used a fake vendor directory placed inside _fixtures to -import some support packages. -In go.mod mode vendor directory are only supported on the root of the -project, which breaks some of our tests. -Since vendor directories outside the root of the project are so rare -anyway it's possible that a future version of go will stop supporting -it even in GOPATH mode. -Also it was weird and unnecessary in the first place anyawy. ---- - _fixtures/consts.go | 2 +- - _fixtures/dotpackagesiface.go | 4 ++-- - _fixtures/{vendor => internal}/dir.io/dir.go | 0 - .../{vendor => internal}/dir.io/io.io/io.go | 0 - .../{vendor => internal}/dir0/pkg/main.go | 0 - .../dir0/renamedpackage/main.go | 0 - .../{vendor => internal}/dir1/pkg/main.go | 0 - _fixtures/pkgrenames.go | 6 ++--- - service/test/variables_test.go | 24 +++++++++---------- - 9 files changed, 18 insertions(+), 18 deletions(-) - rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) - rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) - rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) - rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) - rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) - -diff --git a/_fixtures/consts.go b/_fixtures/consts.go -index 531a27db..54bfa8b2 100644 ---- a/_fixtures/consts.go -+++ b/_fixtures/consts.go -@@ -1,8 +1,8 @@ - package main - - import ( -- "dir0/pkg" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" - "runtime" - ) - -diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go -index 5ad147c2..5952ebeb 100644 ---- a/_fixtures/dotpackagesiface.go -+++ b/_fixtures/dotpackagesiface.go -@@ -1,9 +1,9 @@ - package main - - import ( -- "dir.io" -- "dir.io/io.io" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" - "runtime" - ) - -diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go -similarity index 100% -rename from _fixtures/vendor/dir.io/dir.go -rename to _fixtures/internal/dir.io/dir.go -diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go -similarity index 100% -rename from _fixtures/vendor/dir.io/io.io/io.go -rename to _fixtures/internal/dir.io/io.io/io.go -diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/pkg/main.go -rename to _fixtures/internal/dir0/pkg/main.go -diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/renamedpackage/main.go -rename to _fixtures/internal/dir0/renamedpackage/main.go -diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir1/pkg/main.go -rename to _fixtures/internal/dir1/pkg/main.go -diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go -index d315e6b7..6e0882dc 100644 ---- a/_fixtures/pkgrenames.go -+++ b/_fixtures/pkgrenames.go -@@ -8,9 +8,9 @@ import ( - pkg1 "go/ast" - pkg2 "net/http" - -- "dir0/pkg" -- "dir0/renamedpackage" -- dir1pkg "dir1/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" -+ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" - ) - - func main() { -diff --git a/service/test/variables_test.go b/service/test/variables_test.go -index 83fb6e7a..0e29202a 100644 ---- a/service/test/variables_test.go -+++ b/service/test/variables_test.go -@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { - {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, - - // Package name that doesn't match import path -- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, -+ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, - - // Interfaces to anonymous types - {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, -- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, -+ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -+ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -+ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -+ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -+ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -+ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -+ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -+ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -+ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -+ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, - - {`"dir0/pkg".A`, false, "0", "", "int", nil}, - {`"dir1/pkg".A`, false, "1", "", "int", nil}, -@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { - if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { - // before 1.9 embedded struct field have fieldname == type - if tc.name == "astruct2" { -- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` -+ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` - } - } - variable, err := evalVariable(p, tc.name, pnormalLoadConfig) commit da74eae497435bb41a624c5c4f15876502585917 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 4 01:52:04 2019 -0800 Update doc location output, cleanup spec diff --git a/delve.spec b/delve.spec index bddcced..46d6ce3 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./eval-symlink-in-test.patch Patch2: ./test-fixture-vendor-to-internal.patch +Patch3: ./doc-location.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) @@ -54,10 +55,7 @@ building other packages which use import path with %prep -%forgesetup - -%patch1 -p1 -%patch2 -p1 +%forgeautosetup -p1 rm -rf vendor/ diff --git a/doc-location.patch b/doc-location.patch new file mode 100644 index 0000000..79a5f46 --- /dev/null +++ b/doc-location.patch @@ -0,0 +1,51 @@ +From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Mon, 4 Feb 2019 01:49:43 -0800 +Subject: [PATCH] Update doc location for RPM package + +--- + pkg/terminal/command.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go +index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 +--- a/pkg/terminal/command.go ++++ b/pkg/terminal/command.go +@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, + + break [name] <linespec> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. + + trace [name] <linespec> + +-A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. +@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. + + [goroutine <n>] [frame <m>] print <expression> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, + {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. + + whatis <expression>.`}, +@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des + + [goroutine <n>] [frame <m>] set <variable> = <value> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, + {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. + + sources [<regex>] +-- +2.16.5 + commit 1881006b0f0a31290a6d11aeb4228e1d6e2da1c0 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Nov 1 13:37:02 2018 -0700 Initial spec file diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bddcced --- /dev/null +++ b/delve.spec @@ -0,0 +1,94 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/derekparker/delve +%global goipath github.com/derekparker/delve +Version: 1.1.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 1%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +Patch1: ./eval-symlink-in-test.patch +Patch2: ./test-fixture-vendor-to-internal.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgesetup + +%patch1 -p1 +%patch2 -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +%gochecks +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +- First package for Fedora diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch new file mode 100644 index 0000000..58aa079 --- /dev/null +++ b/eval-symlink-in-test.patch @@ -0,0 +1,29 @@ +From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 +From: Derek Parker <parkerderek86(a)gmail.com> +Date: Fri, 4 Jan 2019 02:03:16 -0800 +Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) + +Some build environments (such as when building RPMs) enjoy symlinking +things. This unfortunately causes our tests to fail as we record the +path of fixtures and use that when looking up file:line information. +However, the debug info in the binary records the original file +location, not the location of the symlink. +--- + pkg/proc/test/support.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 733bad85..5f4a4127 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + + source, _ := filepath.Abs(path) + source = filepath.ToSlash(source) ++ sympath, err := filepath.EvalSymlinks(source) ++ if err == nil { ++ source = strings.Replace(sympath, "\\", "/", -1) ++ } + + fixture := Fixture{Name: name, Path: tmpfile, Source: source} + diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch new file mode 100644 index 0000000..774de87 --- /dev/null +++ b/test-fixture-vendor-to-internal.patch @@ -0,0 +1,142 @@ +From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 +From: aarzilli <alessandro.arzilli(a)gmail.com> +Date: Tue, 6 Nov 2018 12:11:51 +0100 +Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal + +Some tests used a fake vendor directory placed inside _fixtures to +import some support packages. +In go.mod mode vendor directory are only supported on the root of the +project, which breaks some of our tests. +Since vendor directories outside the root of the project are so rare +anyway it's possible that a future version of go will stop supporting +it even in GOPATH mode. +Also it was weird and unnecessary in the first place anyawy. +--- + _fixtures/consts.go | 2 +- + _fixtures/dotpackagesiface.go | 4 ++-- + _fixtures/{vendor => internal}/dir.io/dir.go | 0 + .../{vendor => internal}/dir.io/io.io/io.go | 0 + .../{vendor => internal}/dir0/pkg/main.go | 0 + .../dir0/renamedpackage/main.go | 0 + .../{vendor => internal}/dir1/pkg/main.go | 0 + _fixtures/pkgrenames.go | 6 ++--- + service/test/variables_test.go | 24 +++++++++---------- + 9 files changed, 18 insertions(+), 18 deletions(-) + rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) + rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) + rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) + rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) + rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) + +diff --git a/_fixtures/consts.go b/_fixtures/consts.go +index 531a27db..54bfa8b2 100644 +--- a/_fixtures/consts.go ++++ b/_fixtures/consts.go +@@ -1,8 +1,8 @@ + package main + + import ( +- "dir0/pkg" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" + "runtime" + ) + +diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go +index 5ad147c2..5952ebeb 100644 +--- a/_fixtures/dotpackagesiface.go ++++ b/_fixtures/dotpackagesiface.go +@@ -1,9 +1,9 @@ + package main + + import ( +- "dir.io" +- "dir.io/io.io" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" + "runtime" + ) + +diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go +similarity index 100% +rename from _fixtures/vendor/dir.io/dir.go +rename to _fixtures/internal/dir.io/dir.go +diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go +similarity index 100% +rename from _fixtures/vendor/dir.io/io.io/io.go +rename to _fixtures/internal/dir.io/io.io/io.go +diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/pkg/main.go +rename to _fixtures/internal/dir0/pkg/main.go +diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/renamedpackage/main.go +rename to _fixtures/internal/dir0/renamedpackage/main.go +diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir1/pkg/main.go +rename to _fixtures/internal/dir1/pkg/main.go +diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go +index d315e6b7..6e0882dc 100644 +--- a/_fixtures/pkgrenames.go ++++ b/_fixtures/pkgrenames.go +@@ -8,9 +8,9 @@ import ( + pkg1 "go/ast" + pkg2 "net/http" + +- "dir0/pkg" +- "dir0/renamedpackage" +- dir1pkg "dir1/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" ++ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" + ) + + func main() { +diff --git a/service/test/variables_test.go b/service/test/variables_test.go +index 83fb6e7a..0e29202a 100644 +--- a/service/test/variables_test.go ++++ b/service/test/variables_test.go +@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { + {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, + + // Package name that doesn't match import path +- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, ++ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, + + // Interfaces to anonymous types + {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, +- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, +- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, +- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, +- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, +- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, +- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, +- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, +- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, +- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, +- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, ++ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, ++ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, ++ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, ++ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, ++ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, ++ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, ++ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, ++ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, ++ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, ++ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, + + {`"dir0/pkg".A`, false, "0", "", "int", nil}, + {`"dir1/pkg".A`, false, "1", "", "int", nil}, +@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { + if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { + // before 1.9 embedded struct field have fieldname == type + if tc.name == "astruct2" { +- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` ++ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` + } + } + variable, err := evalVariable(p, tc.name, pnormalLoadConfig)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes March 2023