[CVS] RPM: rpm-5_4: rpm/ devtool.conf rpm/rpmio/ rpmsp.c

[Jeff Johnson]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   28-Feb-2012 23:18:02
  Branch: rpm-5_4                          Handle: 2012022822180100

  Modified files:           (Branch: rpm-5_4)
    rpm                     devtool.conf
    rpm/rpmio               rpmsp.c

  Log:
    - rescuscitate sepol and enable.

  Summary:
    Revision    Changes     Path
    2.365.2.24  +2  -2      rpm/devtool.conf
    2.7.2.1     +6  -6      rpm/rpmio/rpmsp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.365.2.23 -r2.365.2.24 devtool.conf
  --- rpm/devtool.conf  28 Feb 2012 00:54:01 -0000      2.365.2.23
  +++ rpm/devtool.conf  28 Feb 2012 22:18:01 -0000      2.365.2.24
  @@ -454,8 +454,8 @@
           --with-perlembed=/usr/lib64/perl5/CORE/:/usr/lib64/perl5/CORE \
           --with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \
           --with-selinux \
  -        --without-sepol \
  -        --without-semanage \
  +        --with-sepol \
  +        --with-semanage \
           --without-squirrel \
           --with-build-extlibdep \
           --with-build-maxextlibdep \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsp.c
  ============================================================================
  $ cvs diff -u -r2.7 -r2.7.2.1 rpmsp.c
  --- rpm/rpmio/rpmsp.c 18 Oct 2010 06:27:42 -0000      2.7
  +++ rpm/rpmio/rpmsp.c 28 Feb 2012 22:18:01 -0000      2.7.2.1
  @@ -88,17 +88,17 @@
        return NULL;
       }
   
  -    if ((xx = sepol_context_create(SP->I, &sp->C)) < 0) {
  +    if ((xx = sepol_context_create(sp->I, (sepol_context_t **)&sp->C)) < 0) {
   if (_rpmsp_debug)
   fprintf(stderr, "--> %s: sepol_context_create: %s\n", __FUNCTION__, 
strerror(errno));        /* XXX errno? */
  -     (void)rpmsmFree(sm);
  +     (void)rpmspFree(sp);
        return NULL;
       }
   
       if ((xx = sepol_module_package_create(&sp->P)) < 0) {
   if (_rpmsp_debug)
   fprintf(stderr, "--> %s: sepol_module_package_create: %s\n", __FUNCTION__, 
strerror(errno)); /* XXX errno? */
  -     (void)rpmsmFree(sm);
  +     (void)rpmspFree(sp);
        return NULL;
       }
   
  @@ -108,14 +108,14 @@
        if (fp == NULL || ferror(fp)) {
   if (_rpmsp_debug)
   fprintf(stderr, "--> %s: fopen(%s)\n", __FUNCTION__, fn);
  -         (void)rpmsmFree(sm);
  +         (void)rpmspFree(sp);
            return NULL;
        }
   
        if ((xx = sepol_policy_file_create(&sp->F)) < 0) {
   if (_rpmsp_debug)
   fprintf(stderr, "--> %s: sepol_policy_file_create: %s\n", __FUNCTION__, 
strerror(errno));    /* XXX errno? */
  -         (void)rpmsmFree(sm);
  +         (void)rpmspFree(sp);
            return NULL;
        }
        sepol_policy_file_set_handle(sp->F, sp->I);
  @@ -124,7 +124,7 @@
        if ((xx = sepol_policydb_create(&sp->DB)) < 0) {
   if (_rpmsp_debug)
   fprintf(stderr, "--> %s: sepol_policydb_create: %s\n", __FUNCTION__, 
strerror(errno));       /* XXX errno? */
  -         (void)rpmsmFree(sm);
  +         (void)rpmspFree(sp);
            return NULL;
        }
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org