diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-05-08 14:37:29 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-05-08 14:37:29 +0300 |
| commit | 4ad7f40395be970b7d84cb9782ce6c7717db9d37 (patch) | |
| tree | 0661cc8981f6d55c4065805e450987a03da63f74 | |
| parent | c9b6fc7e2d3d7395346acf3e3092d22474d82d55 (diff) | |
| download | rpm-4ad7f40395be970b7d84cb9782ce6c7717db9d37.tar.gz | |
Rip useless ROOT_GROUP checking from configure
- it was only used for an ancient RH-specific %_fixgroup anyway which
in turn only ever did anything when building as root - bad bad...
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | platform.in | 2 |
2 files changed, 0 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 3c7714dd7..04c936c75 100644 --- a/configure.ac +++ b/configure.ac @@ -885,40 +885,6 @@ AC_CHECK_FUNC(lchown, AC_SUBST(__CHOWN_RHF) AC_SUBST(__CHGRP_RHF) -dnl -dnl figure out what root's primary group is -dnl -AC_MSG_CHECKING(root's primary group) -AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> -#include <sys/types.h> -#include <pwd.h> -#include <grp.h> - -int main() -{ - struct passwd *root = NULL; - struct group *roots_group = NULL; - FILE * tempfile = NULL; - - root = getpwuid( (uid_t) 0 ); - if (root != NULL) { - roots_group = getgrgid(root->pw_gid); - if (roots_group != NULL) { - tempfile = fopen("conftest_rootg", "w"); - if (tempfile != NULL) { - fprintf(tempfile, "%s\n", roots_group->gr_name); - fclose(tempfile); - exit(0); - } - } - } - - exit(1); -}]])],[ROOT_GROUP=`cat conftest_rootg`],[ROOT_GROUP="root"],[ROOT_GROUP="root" -]) -AC_MSG_RESULT($ROOT_GROUP) -AC_SUBST(ROOT_GROUP) - if echo "$host_os" | grep sco > /dev/null; then echo "hacking things up for sco" AC_DEFINE(NEED_STRINGS_H, 1, [Define as one if we need to include <strings.h> (along with <string.h>)]) diff --git a/platform.in b/platform.in index ed4f148ad..04e3c5460 100644 --- a/platform.in +++ b/platform.in @@ -76,8 +76,6 @@ @redhat@%__id_u @__ID_U@ @redhat@%__chown_Rhf @__CHOWN_RHF@ @redhat@%__chgrp_Rhf @__CHGRP_RHF@ -@redhat@%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root -@redhat@%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@ @redhat@%_fixperms %{__chmod} -Rf @FIXPERMS@ @redhat@#--------------------------------------------------------------------- @redhat@# Always use %defattr(-,root,root) in %files (added in rpm-4.0.4) |