gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bump version and make it work

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2006-12-21 13:52:43 +00:00
parent 3c9baee374
commit ae5ff6bc50
3 changed files with 1075 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/sudo/sudo.mk
View File

@ -4,7 +4,7 @@
#
#############################################################
SUDO_VER:=1.6.8p9
SUDO_VER:=1.6.8p12
SUDO_SOURCE:=sudo-$(SUDO_VER).tar.gz
SUDO_SITE:=http://www.courtesan.com/sudo/dist
SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VER)
@ -24,6 +24,7 @@ $(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE)
(cd $(SUDO_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
./configure \
CFLAGS="$(TARGET_CFLAGS)" \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@ -54,15 +55,17 @@ $(SUDO_DIR)/sudo: $(SUDO_DIR)/.configured
touch -c $(SUDO_DIR)/sudo
$(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo
# Use fakeroot to pretend to do 'make install' as root
echo "$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR="$(TARGET_DIR)" -C $(SUDO_DIR) install" \
> $(STAGING_DIR)/.fakeroot.sudo
$(INSTALL) -m 4555 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo
$(INSTALL) -m 0555 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo
$(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers
$(STRIP) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo
touch -c $(TARGET_DIR)/usr/bin/sudo
sudo: uclibc host-fakeroot $(TARGET_DIR)/usr/bin/sudo
sudo: uclibc $(TARGET_DIR)/usr/bin/sudo
sudo-clean:
rm -f $(TARGET_DIR)/usr/bin/sudo
rm -f $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/etc/sudoers \
$(TARGET_DIR)/usr/sbin/visudo
-$(MAKE) -C $(SUDO_DIR) clean
sudo-dirclean:

1179
package/sudo/sudo_1.6.8p9-2ubuntu2.3.patch → package/sudo/sudo_1.6.8p12-1ubuntu6.patch
View File

File diff suppressed because it is too large Load Diff

22
package/sudo/sudo_1.6.8p12-2-no-cxx-configcheck.patch Normal file
View File

@ -0,0 +1,22 @@
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'