[CVS] RPM: rpm-5_4: rpm/ rpmqv.c

2016-03-28 Thread 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-Mar-2016 21:12:14
  Branch: rpm-5_4  Handle: 2016032819121400

  Modified files:   (Branch: rpm-5_4)
rpm rpmqv.c

  Log:
- build: don't assume -v if --quiet was given.
- build: permit --noparentdirs/--nolinktos with rpmbuild.

  Summary:
RevisionChanges Path
1.167.4.12  +3  -1  rpm/rpmqv.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.167.4.11 -r1.167.4.12 rpmqv.c
  --- rpm/rpmqv.c   13 Aug 2014 16:40:12 -  1.167.4.11
  +++ rpm/rpmqv.c   28 Mar 2016 19:12:14 -  1.167.4.12
  @@ -181,7 +181,7 @@
   #endif
   #endif   /* IAM_RPMQV */
   
  -#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
  +#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliDepFlagsPoptTable, 0,
   N_("Dependency check/order options:"),
   NULL },
  @@ -861,6 +861,7 @@
   {const char * pkg;
int nbuilds = 0;
   
  + if (rpmIsNormal())
   while (!rpmIsVerbose())
rpmIncreaseVerbosity();
   
  @@ -907,6 +908,7 @@
   #if defined(RPM_VENDOR_OPENPKG) /* 
no-auto-verbose-increase-for-track-and-fetch */
if (ba->buildChar != 't' && ba->buildChar != 'f')
   #endif
  + if (rpmIsNormal())
   while (!rpmIsVerbose())
rpmIncreaseVerbosity();
  
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ rpmqv.c

2014-08-13 Thread 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:   13-Aug-2014 18:40:13
  Branch: rpm-5_4  Handle: 2014081316401200

  Modified files:   (Branch: rpm-5_4)
rpm rpmqv.c

  Log:
- c++: fix: remove strict alias warnings to actually set bit flags.

  Summary:
RevisionChanges Path
1.167.4.11  +48 -32 rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.167.4.10 -r1.167.4.11 rpmqv.c
  --- rpm/rpmqv.c   4 Sep 2013 15:32:32 -   1.167.4.10
  +++ rpm/rpmqv.c   13 Aug 2014 16:40:12 -  1.167.4.11
  @@ -60,34 +60,54 @@
   #ifdef __cplusplus
   
   #define QVA_ISSET(_qvaflags, _FLAG)  ((_qvaflags)  (VERIFY_##_FLAG))
  -#define QVA_SET(_qvaflags, _FLAG)\
  - (*((unsigned *)(_qvaflags)) |= (VERIFY_##_FLAG))
  -#define QVA_CLR(_qvaflags, _FLAG)\
  - (*((unsigned *)(_qvaflags)) = ~(VERIFY_##_FLAG))
  +#define QVA_SET(_qvaflags, _FLAG) { \
  + unsigned ui = (unsigned)(_qvaflags); ui |= (VERIFY_##_FLAG); \
  + (_qvaflags) = (rpmVerifyFlags) ui; \
  + }
  +#define QVA_CLR(_qvaflags, _FLAG) { \
  + unsigned ui = (unsigned)(_qvaflags); ui = ~(VERIFY_##_FLAG); \
  + (_qvaflags) = (rpmVerifyFlags) ui; \
  + }
   
   #define VSF_ISSET(_vsflags, _FLAG)   ((_vsflags)  (RPMVSF_##_FLAG))
  -#define VSF_SET(_vsflags, _FLAG) \
  - (*((unsigned *)(_vsflags)) |= (RPMVSF_##_FLAG))
  -#define VSF_CLR(_vsflags, _FLAG) \
  - (*((unsigned *)(_vsflags)) = ~(RPMVSF_##_FLAG))
  +#define VSF_SET(_vsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_vsflags); ui |= (RPMVSF_##_FLAG); \
  + (_vsflags) = (pgpVSFlags) ui; \
  + }
  +#define VSF_CLR(_vsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_vsflags); ui = ~(RPMVSF_##_FLAG); \
  + (_vsflags) = (pgpVSFlags) ui; \
  + }
   
   #define TSF_ISSET(_tsflags, _FLAG)   ((_tsflags)  (RPMTRANS_FLAG_##_FLAG))
  -#define TSF_SET(_tsflags, _FLAG) \
  - (*((unsigned *)(_tsflags)) |= (RPMTRANS_FLAG_##_FLAG))
  -#define TSF_CLR(_tsflags, _FLAG) \
  - (*((unsigned *)(_tsflags)) = ~(RPMTRANS_FLAG_##_FLAG))
  +#define TSF_SET(_tsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_tsflags); ui |= (RPMTRANS_FLAG_##_FLAG); \
  + (_tsflags) = (rpmtransFlags) ui; \
  + }
  +#define TSF_CLR(_tsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_tsflags); ui = ~(RPMTRANS_FLAG_##_FLAG); \
  + (_tsflags) = (rpmtransFlags) ui; \
  + }
   
   #define IIF_ISSET(_iflags, _FLAG)((_iflags)  (INSTALL_##_FLAG))
  -#define IIF_SET(_iflags, _FLAG)  \
  - (*((unsigned *)(_iflags)) |= (INSTALL_##_FLAG))
  -#define IIF_CLR(_iflags, _FLAG)  \
  - (*((unsigned *)(_iflags)) = ~(INSTALL_##_FLAG))
  +#define IIF_SET(_iflags, _FLAG)  { \
  + unsigned ui = (unsigned)(_iflags); ui |= (INSTALL_##_FLAG); \
  + (_iflags) = (rpmInstallInterfaceFlags) ui; \
  + }
  +#define IIF_CLR(_iflags, _FLAG)  { \
  + unsigned ui = (unsigned)(_iflags); ui = ~(INSTALL_##_FLAG); \
  + (_iflags) = (rpmInstallInterfaceFlags) ui; \
  + }
   
   #define PFF_ISSET(_pfflags, _FLAG)   ((_pfflags)  (RPMPROB_FILTER_##_FLAG))
  -#define PFF_SET(_pfflags, _FLAG) \
  - (*((unsigned *)(_pfflags)) |= (RPMPROB_FILTER_##_FLAG))
  -#define PFF_CLR(_pfflags, _FLAG) \
  - (*((unsigned *)(_pfflags)) = ~(RPMPROB_FILTER_##_FLAG))
  +#define PFF_SET(_pfflags, _FLAG) { \
  + unsigned ui = (unsigned)(_pfflags); ui |= (RPMPROB_FILTER_##_FLAG); \
  + (_pfflags) = (rpmprobFilterFlags) ui; \
  + }
  +#define PFF_CLR(_pfflags, _FLAG) { \
  + unsigned ui = (unsigned)(_pfflags); ui = ~(RPMPROB_FILTER_##_FLAG); \
  + (_pfflags) = (rpmprobFilterFlags) ui; \
  + }
   
   #else/* __cplusplus */
   
  @@ -1044,14 +1064,12 @@
   
   case MODE_VERIFY:
   {rpmVerifyFlags vflags = (rpmVerifyFlags) ~RPMVERIFY_NONE;
  + unsigned ui;
   
qva-depFlags = (rpmdepFlags) global_depFlags;
  -#ifdef   __cplusplus
  - *((unsigned *)vflags) = ~qva-qva_flags;
  -#else
  - vflags = ~qva-qva_flags;
  -#endif
  - qva-qva_flags = (rpmQueryFlags) vflags;
  + ui = (unsigned) vflags;
  + ui = ~((unsigned)qva-qva_flags);
  + qva-qva_flags = (rpmQueryFlags) ui;
   
if (!poptPeekArg(optCon)
  !(qva-qva_source == RPMQV_ALL || qva-qva_source == RPMQV_HDLIST))
  @@ -1063,17 +1081,15 @@
   #ifdef IAM_RPMK
   case MODE_CHECKSIG:
   {rpmVerifyFlags vflags = (rpmVerifyFlags) 0;
  + unsigned ui;

[CVS] RPM: rpm-5_4: rpm/ rpmqv.c

2012-04-29 Thread 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:   29-Apr-2012 23:19:16
  Branch: rpm-5_4  Handle: 2012042921191600

  Modified files:   (Branch: rpm-5_4)
rpm rpmqv.c

  Log:
- c++: fix: revert some over-zealous changes.

  Summary:
RevisionChanges Path
1.167.4.8   +6  -27 rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.167.4.7 -r1.167.4.8 rpmqv.c
  --- rpm/rpmqv.c   27 Apr 2012 19:13:48 -  1.167.4.7
  +++ rpm/rpmqv.c   29 Apr 2012 21:19:16 -  1.167.4.8
  @@ -938,23 +938,14 @@
   
   #ifdef   IAM_RPMEIU
   case MODE_ERASE:
  - ia-depFlags = (rpmdepFlags) global_depFlags;
  + ia-depFlags = global_depFlags;
  + if (ia-noDeps) ia-installInterfaceFlags |= INSTALL_NODEPS;
   
if (!poptPeekArg(optCon)) {
if (ia-rbtid == 0)
argerror(_(no packages given for erase));
  -
  -#ifdef   __cplusplus
  - if (ia-noDeps)
  - *((unsigned *)ia-installInterfaceFlags) |= INSTALL_NODEPS;
  -*((unsigned *)ia-transFlags) |= RPMTRANS_FLAG_NOFDIGESTS;
  -*((unsigned *)ia-probFilter) |= RPMPROB_FILTER_OLDPACKAGE;
  -#else
  - if (ia-noDeps) ia-installInterfaceFlags |= INSTALL_NODEPS;
   ia-transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
   ia-probFilter |= RPMPROB_FILTER_OLDPACKAGE;
  -#endif
  -
   ia-rbCheck = rpmcliInstallCheck;
   ia-rbOrder = rpmcliInstallOrder;
   ia-rbRun = rpmcliInstallRun;
  @@ -968,18 +959,16 @@
   
/* RPMTRANS_FLAG_KEEPOBSOLETE */
   
  - ia-depFlags = (rpmdepFlags) global_depFlags;
  + ia-depFlags = global_depFlags;
if (!ia-incldocs) {
if (ia-transFlags  RPMTRANS_FLAG_NODOCS) {
;
} else if (rpmExpandNumeric(%{_excludedocs}))
  -#ifdef   __cplusplus
  - *((unsigned *)ia-transFlags) |= RPMTRANS_FLAG_NODOCS;
  -#else
ia-transFlags |= RPMTRANS_FLAG_NODOCS;
  -#endif
}
   
  + if (ia-noDeps) ia-installInterfaceFlags |= INSTALL_NODEPS;
  +
/* we've already ensured !(!ia-prefix  !ia-relocations) */
/*@-branchstate@*/
if (ia-qva_prefix) {
  @@ -996,18 +985,8 @@
if (!poptPeekArg(optCon)) {
if (ia-rbtid == 0)
argerror(_(no packages given for install));
  -
  -#ifdef   __cplusplus
  - if (ia-noDeps)
  - *((unsigned *)ia-installInterfaceFlags) |= INSTALL_NODEPS;
  -*((unsigned *)ia-transFlags) |= RPMTRANS_FLAG_NOFDIGESTS;
  -*((unsigned *)ia-probFilter) |= RPMPROB_FILTER_OLDPACKAGE;
  -#else
  - if (ia-noDeps) ia-installInterfaceFlags |= INSTALL_NODEPS;
   ia-transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
   ia-probFilter |= RPMPROB_FILTER_OLDPACKAGE;
  -#endif
  -
   ia-rbCheck = rpmcliInstallCheck;
   ia-rbOrder = rpmcliInstallOrder;
   ia-rbRun = rpmcliInstallRun;
  @@ -1034,7 +1013,7 @@
break;
   
   case MODE_VERIFY:
  -{rpmVerifyFlags vflags = (rpmVerifyFlags) VERIFY_ALL;
  +{rpmVerifyFlags vflags = (rpmVerifyFlags) ~RPMVERIFY_NONE;
   
qva-depFlags = (rpmdepFlags) global_depFlags;
   #ifdef   __cplusplus
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ rpmqv.c

2011-03-30 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   30-Mar-2011 16:25:39
  Branch: rpm-5_4  Handle: 2011033014253900

  Modified files:   (Branch: rpm-5_4)
rpm rpmqv.c

  Log:
place 'rpm -ba' short-circuitting under mandriva #ifdef

  Summary:
RevisionChanges Path
1.167.4.4   +4  -0  rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.167.4.3 -r1.167.4.4 rpmqv.c
  --- rpm/rpmqv.c   27 Mar 2011 21:55:54 -  1.167.4.3
  +++ rpm/rpmqv.c   30 Mar 2011 14:25:39 -  1.167.4.4
  @@ -822,7 +822,11 @@
case 'b':
ba-buildAmount |= RPMBUILD_PACKAGEBINARY;
ba-buildAmount |= RPMBUILD_CLEAN;
  +#if defined(RPM_VENDOR_MANDRIVA)
  + if ((ba-buildChar == 'a' || ba-buildChar == 'b')  
ba-shortCircuit)
  +#else
if ((ba-buildChar == 'b')  ba-shortCircuit)
  +#endif
/*@innerbreak@*/ break;
/*@fallthrough@*/
case 'i':
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ rpmqv.c

2011-03-27 Thread 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:   27-Mar-2011 23:55:54
  Branch: rpm-5_4  Handle: 2011032721555400

  Modified files:   (Branch: rpm-5_4)
rpm rpmqv.c

  Log:
- revert -ba --short-circuit

  Summary:
RevisionChanges Path
1.167.4.3   +1  -1  rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.167.4.2 -r1.167.4.3 rpmqv.c
  --- rpm/rpmqv.c   27 Mar 2011 20:42:57 -  1.167.4.2
  +++ rpm/rpmqv.c   27 Mar 2011 21:55:54 -  1.167.4.3
  @@ -822,7 +822,7 @@
case 'b':
ba-buildAmount |= RPMBUILD_PACKAGEBINARY;
ba-buildAmount |= RPMBUILD_CLEAN;
  - if ((ba-buildChar == 'a' || ba-buildChar == 'b')  
ba-shortCircuit)
  + if ((ba-buildChar == 'b')  ba-shortCircuit)
/*@innerbreak@*/ break;
/*@fallthrough@*/
case 'i':
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org