diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /sudo | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'sudo')
-rw-r--r-- | sudo/sudo-1.6.7p5/configure.patch | 42 | ||||
-rw-r--r-- | sudo/sudo-1.6.7p5/nonrootinstall.patch | 58 | ||||
-rw-r--r-- | sudo/sudo-1.6.7p5/nostrip.patch | 27 | ||||
-rw-r--r-- | sudo/sudo_1.6.7p5.bb | 0 |
4 files changed, 0 insertions, 127 deletions
diff --git a/sudo/sudo-1.6.7p5/configure.patch b/sudo/sudo-1.6.7p5/configure.patch deleted file mode 100644 index b33ea48a9d..0000000000 --- a/sudo/sudo-1.6.7p5/configure.patch +++ /dev/null @@ -1,42 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- sudo-1.6.7p5/configure.in~configure 2003-05-06 11:22:36.000000000 -0400 -+++ sudo-1.6.7p5/configure.in 2004-01-20 00:04:46.000000000 -0500 -@@ -1652,12 +1652,14 @@ - if test -z "$BROKEN_GETCWD"; then - AC_REPLACE_FUNCS(getcwd) - fi --AC_CHECK_FUNCS(lockf flock, [break]) --AC_CHECK_FUNCS(waitpid wait3, [break]) --AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname) [break]]) --AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) [LIBS="${LIBS} -lcompat"], AC_LIBOBJ(lsearch), -), AC_LIBOBJ(lsearch))]) --AC_CHECK_FUNCS(utime, [SUDO_FUNC_UTIME_POSIX], [AC_LIBOBJ(utime)]) --SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH, 1, [Define if you have the `fnmatch' function.]), AC_LIBOBJ(fnmatch)) -+AC_CHECK_FUNCS(lockf flock) -+AC_CHECK_FUNCS(waitpid wait3) -+AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname)]) -+ -+AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, [AC_CHECK_HEADER(search.h, [AC_DEFINE(HAVE_LSEARCH) LIBS="$LIBS -lcompat"], [AC_LIBOBJ([lsearch])])], [AC_LIBOBJ([lsearch])])]) -+ -+AC_CHECK_FUNCS(utime, [SUDO_FUNC_UTIME_POSIX], [AC_LIBOBJ([utime])]) -+SUDO_FUNC_FNMATCH([AC_DEFINE([HAVE_FNMATCH], [1], [Define if you have the 'fnmatch' function.])], [AC_LIBOBJ([fnmatch])]) - SUDO_FUNC_ISBLANK - AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat) - AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1]) ---- sudo-1.6.7p5/aclocal.m4~configure 2003-03-21 13:50:38.000000000 -0500 -+++ sudo-1.6.7p5/aclocal.m4 2004-01-20 00:05:05.000000000 -0500 -@@ -244,9 +244,9 @@ - rm -f core core.* *.core])dnl - AC_MSG_RESULT($sudo_cv_func_fnmatch) - if test $sudo_cv_func_fnmatch = yes; then -- [$1] -+ $1 - else -- [$2] -+ $2 - fi - ]) - diff --git a/sudo/sudo-1.6.7p5/nonrootinstall.patch b/sudo/sudo-1.6.7p5/nonrootinstall.patch deleted file mode 100644 index 45c40e6986..0000000000 --- a/sudo/sudo-1.6.7p5/nonrootinstall.patch +++ /dev/null @@ -1,58 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- sudo-1.6.7p5/Makefile.in~nonrootinstall -+++ sudo-1.6.7p5/Makefile.in -@@ -64,7 +64,7 @@ - # C preprocessor flags - CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ - --# Usually -O and/or -g -+# Usually -o and/or -g - CFLAGS = @CFLAGS@ - - # Flags to pass to the link stage -@@ -96,10 +96,16 @@ - mandirform = $(mandir)/$(mantype)$(mansectform) - - # User and group ids the installed files should be "owned" by -+ifeq ($(DESTDIR),) -+install_owncmd = -o $(install_uid) -g $(install_gid) -+endif - install_uid = 0 - install_gid = 0 - - # User, group, and mode the sudoers file should be "owned" by (configure) -+ifeq ($(DESTDIR),) -+sudoers_owncmd = -o $(sudoers_uid) -g $(sudoers_gid) -+endif - sudoers_uid = @SUDOERS_UID@ - sudoers_gid = @SUDOERS_GID@ - sudoers_mode = @SUDOERS_MODE@ -@@ -302,18 +308,18 @@ - $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) - - install-binaries: $(PROGS) -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo -+ $(INSTALL) $(install_owncmd) -m 4555 -s sudo $(DESTDIR)$(sudodir)/sudo -+ $(INSTALL) $(install_owncmd) -m 0555 -s visudo $(DESTDIR)$(visudodir)/visudo - - install-sudoers: - test -f $(DESTDIR)$(sudoersdir)/sudoers || \ -- $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \ -+ $(INSTALL) $(sudoers_owncmd) -m $(sudoers_mode) \ - $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers - - install-man: -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) -+ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) -+ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) -+ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) - @MAN_POSTINSTALL@ - - check: diff --git a/sudo/sudo-1.6.7p5/nostrip.patch b/sudo/sudo-1.6.7p5/nostrip.patch deleted file mode 100644 index e82f4b67eb..0000000000 --- a/sudo/sudo-1.6.7p5/nostrip.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- sudo-1.6.7p5/Makefile.in~nostrip.patch -+++ sudo-1.6.7p5/Makefile.in -@@ -308,8 +308,8 @@ - $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) - - install-binaries: $(PROGS) -- $(INSTALL) $(install_owncmd) -m 4555 -s sudo $(DESTDIR)$(sudodir)/sudo -- $(INSTALL) $(install_owncmd) -m 0555 -s visudo $(DESTDIR)$(visudodir)/visudo -+ $(INSTALL) $(install_owncmd) -m 4555 sudo $(DESTDIR)$(sudodir)/sudo -+ $(INSTALL) $(install_owncmd) -m 0555 visudo $(DESTDIR)$(visudodir)/visudo - - install-sudoers: - test -f $(DESTDIR)$(sudoersdir)/sudoers || \ -@@ -376,8 +376,6 @@ - -e 's/@_mansectform@/$(mansectform)/g' $(srcdir)/Makefile.binary \ - > $$tdir/Makefile ; \ - ) -- strip sudo -- strip visudo - ( cd tmp.`arch -l` && tar Ocf ../sudo-$(VERSION)-`arch -l`.tar sudo-$(VERSION) ) - gzip --best sudo-$(VERSION)-`arch -l`.tar - rm -rf tmp.`arch -l` diff --git a/sudo/sudo_1.6.7p5.bb b/sudo/sudo_1.6.7p5.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/sudo/sudo_1.6.7p5.bb +++ /dev/null |