glibc: Disable multilib support on X86_64

[people/stevee/ipfire-3.x.git] / mc / mc.nm

diff --git a/mc/mc.nm b/mc/mc.nm
index fcba89f9f4cf01d890be90abfd21075537dd6c9c..1fe8161a69b884c7c672e46cf17a927a4d300ede 100644 (file)
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = mc
-version    = 4.8.3
-release    = 1
+version    = 4.8.29
+release    = 3
 
 groups     = Applications/System
-url        = http://www.ibiblio.org/mc/
+url        = https://midnight-commander.org
 license    = GPLv2+
 summary    = User-friendly text console file manager and visual shell.
 
@@ -20,8 +20,8 @@ description
        specific files.
 end
 
+source_dl  = https://www.midnight-commander.org/downloads/
 sources    = %{thisapp}.tar.xz
-source_dl  = http://www.midnight-commander.org/downloads/
 
 build
        requires
@@ -33,7 +33,6 @@ build
        end
 
        configure_options += \
-               --sysconfdir=/etc \
                --libexecdir=/usr/lib \
                --with-screen=slang \
                --with-samba \
@@ -41,17 +40,26 @@ build
                --enable-charset \
                --disable-rpath
 
+       configure_cmds
+               # Add some additional CFLAGS to the consaver Makefile to proper
+               # harden the binary.
+               sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \
+                       src/consaver/Makefile
+       end
+
        install_cmds
+               # Fix permissions
                chmod 1755 %{BUILDROOT}/usr/lib/mc/cons.saver
+
+               # Remove python2 based helper script for amazon S3.
+               rm -rvf %{BUILDROOT}/usr/lib/mc/extfs.d/s3+
        end
 end
 
 packages
        package %{name}
-               # This awkward dependency is found and cannot be resolved.
-               filter_requires
-                       perl\(pieces\)
-               end
+               # This awkward dependency is found and cannot be resolved
+               filter_requires = perl\(pieces\)
        end
 
        package %{name}-debuginfo