Commit 7a1115b3 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

sudo: bump and convert to AUTOTARGETS 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 95cf21ef

package/sudo/sudo-1.6.8p12-001-ubuntu6.patch

deleted100644 → 0
+0 −3994

File deleted.

Preview size limit exceeded, changes collapsed.

package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
diff -u sudo-1.6.8p12.orig/configure sudo-1.6.8p12/configure

--- sudo-1.6.8p12.orig/configure	2006-12-21 12:06:02.000000000 +0100

+++ sudo-1.6.8p12/configure	2006-12-21 12:12:06.000000000 +0100

@@ -6072,7 +6072,8 @@

 fi

 

 done

-

+if test -n "$CXX"

+then

 ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'

 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

@@ -6654,7 +6655,7 @@

 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

 

-

+fi

 ac_ext=f

 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'

 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

package/sudo/sudo-1.6.8p12-003-cross-compile.patch

deleted100644 → 0
+0 −10219

File deleted.

Preview size limit exceeded, changes collapsed.

package/sudo/sudo.mk

+11 −85
Original line number Diff line number Diff line
@@ -4,97 +4,23 @@ 
#

#############################################################



SUDO_VERSION:=1.6.8p12

SUDO_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sudo

SUDO_SOURCE:=sudo_$(SUDO_VERSION).orig.tar.gz

SUDO_VERSION = 1.7.4p6

SUDO_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sudo

SUDO_SOURCE  = sudo_$(SUDO_VERSION).orig.tar.gz



#SUDO_VERSION:=1.7.0

#SUDO_SITE:=http://www.courtesan.com/sudo/dist

# 1.7.0 Needs update Cross-Compiler patches

# SUDO_SOURCE:=sudo-$(SUDO_VERSION).tar.gz



SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VERSION)

SUDO_UNZIP:=$(ZCAT)



$(DL_DIR)/$(SUDO_SOURCE):

	 $(call DOWNLOAD,$(SUDO_SITE),$(SUDO_SOURCE))



sudo-source: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_CONFIG_FILE)



$(SUDO_DIR)/.unpacked: $(DL_DIR)/$(SUDO_SOURCE)

	$(SUDO_UNZIP) $(DL_DIR)/$(SUDO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(SUDO_DIR) package/sudo sudo-$(SUDO_VERSION)\*.patch

	$(CONFIG_UPDATE) $(SUDO_DIR)

	touch $@



$(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE)

	(cd $(SUDO_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		./configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--exec-prefix=/usr \

		--bindir=/usr/bin \

		--sbindir=/usr/sbin \

		--libdir=/lib \

		--libexecdir=/usr/lib \

		--sysconfdir=/etc \

		--datadir=/usr/share \

		--localstatedir=/var \

		--mandir=/usr/man \

		--infodir=/usr/info \

		$(DISABLE_LARGEFILE) \

SUDO_CONF_OPT = \

		--without-lecture \

		--without-sendmail \

		--without-umask \

		--with-logging=syslog \

		--without-interfaces \

		--disable-authentication \

		$(SUDO_EXTRA_CONFIG) \

	)



	touch $@



$(SUDO_DIR)/sudo: $(SUDO_DIR)/.configured

	$(MAKE) -C $(SUDO_DIR)

	touch -c $@



$(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo

	rm -f $(TARGET_DIR)/usr/bin/sudo

	rm -f $(TARGET_DIR)/usr/sbin/visudo

	rm -f $(TARGET_DIR)/etc/sudoers

	$(INSTALL) -m 0777 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo

	$(INSTALL) -m 0777 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo

	$(STRIPCMD) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo

	chmod 4555  $(TARGET_DIR)/usr/bin/sudo

	chmod 0555  $(TARGET_DIR)/usr/sbin/visudo

	$(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers

	touch -c $(TARGET_DIR)/usr/bin/sudo

		--without-pam



sudo: $(TARGET_DIR)/usr/bin/sudo



sudo-unpacked: $(SUDO_DIR)/.unpacked



sudo-clean:

	rm -f $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/etc/sudoers \

		$(TARGET_DIR)/usr/sbin/visudo

	-$(MAKE) -C $(SUDO_DIR) clean



sudo-dirclean:

	rm -rf $(SUDO_DIR)

#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_SUDO),y)

TARGETS+=sudo

endif

define SUDO_INSTALL_TARGET_CMDS

	install -m 4555 -D $(@D)/sudo $(TARGET_DIR)/usr/bin/sudo

	install -m 0555 -D $(@D)/visudo $(TARGET_DIR)/usr/sbin/visudo

	install -m 0440 -D $(@D)/sudoers $(TARGET_DIR)/etc/sudoers

endef



ifeq ($(BR2_PACKAGE_LIBPAM),y)

SUDO_EXTRA_CONFIG=--enable-pam

sudo: libpam

endif
 
$(eval $(call AUTOTARGETS,package,sudo))
 
 No newline at end of file