ruby-rpm 1.3.0 → 1.3.1

data/ext/rpm/package.c

@@ -7,8 +7,11 @@
 /* $Id: package.c 45 2004-06-04 15:11:20Z kazuhiko $ */
 
 #include "private.h"
+#include <st.h>
 
+#ifndef stpcpy
 char *stpcpy( char *dest, const char *source );
+#endif
 
 VALUE rpm_cPackage;
 VALUE rpm_sChangeLog;
@@ -16,6 +19,11 @@ VALUE rpm_sChangeLog;
 static ID id_signature;
 struct st_table *tbl = NULL;
 
+#if RPM_VERSION(5,0,0) <= RPM_VERSION_CODE
+#define headerGetEntryMinMemory(hdr,tag,type,ptr,cnt) \
+        headerGetEntry(hdr,tag,type,(void**)ptr,cnt)
+#endif
+
 static VALUE
 package_clear_cache(VALUE klass){
 	st_free_table(tbl);
@@ -81,6 +89,12 @@ package_new_from_header(VALUE klass, Header hdr)
 	return p;
 }
 
+/*
+ * Creates a new package object
+ * @param [String] name Package name
+ * @param [Version] version Package version
+ * @return [Package]
+ */
 static VALUE
 package_s_create(VALUE klass, VALUE name, VALUE version)
 {
@@ -121,6 +135,15 @@ static rpmRC read_header_from_file(FD_t fd, const char *filename, Header *hdr)
     return rc;
 }
 
+/*
+ * Creates a +Package+ object from a rpm located on disk
+ * @param [String] filename Path to filename
+ * @return [Package]
+ * @example
+ *   pkg = RPM::Package.open('/home/foo/myprogram-1.0-x86_64.rpm')
+ *   pkg.name => 'myprogram'
+ *   pkg.version => '1.0'
+ */
 static VALUE
 package_s_open(VALUE klass, VALUE filename)
 {
@@ -178,6 +201,11 @@ package_s_open(VALUE klass, VALUE filename)
 	return pkg;
 }
 
+/*
+ * Create a new package object from data
+ * @param [String] str Header data
+ * @return [Package]
+ */
 static VALUE
 package_s_load(VALUE klass, VALUE str)
 {
@@ -236,6 +264,10 @@ rpm_package_new_from_N_EVR(VALUE name, VALUE version)
 }
 #endif
 
+/*
+ * Add a dependency to the package header
+ * @param [Dependency] dep Dependency to add
+ */
 VALUE
 rpm_package_add_dependency(VALUE pkg,VALUE dep)
 {
@@ -264,6 +296,11 @@ rpm_package_add_dependency(VALUE pkg,VALUE dep)
   return Qnil;
 }
 
+/*
+ * Add a int32 value to the package header
+ * @param [Number] tag Tag
+ * @param [Number] val Value
+ */
 VALUE
 rpm_package_add_int32(VALUE pkg,VALUE tag,VALUE val)
 {
@@ -282,6 +319,11 @@ rpm_package_add_int32(VALUE pkg,VALUE tag,VALUE val)
   return Qnil;
 }
 
+/*
+ * Add a list of strings to the package header
+ * @param [Number] tag Tag
+ * @param [Array<String>] val Strings to add
+ */
 VALUE
 rpm_package_add_string_array(VALUE pkg,VALUE tag,VALUE val)
 {
@@ -292,6 +334,11 @@ rpm_package_add_string_array(VALUE pkg,VALUE tag,VALUE val)
   return Qnil;
 }
 
+/*
+ * Add a binary value to the package header
+ * @param [Number] tag Tag
+ * @param [String] val String to add
+ */
 VALUE
 rpm_package_add_string(VALUE pkg,VALUE tag,VALUE val)
 {
@@ -302,6 +349,11 @@ rpm_package_add_string(VALUE pkg,VALUE tag,VALUE val)
   return Qnil;
 }
 
+/*
+ * Add a binary value to the package header
+ * @param [Number] tag Tag
+ * @param [String] val Value
+ */
 VALUE
 rpm_package_add_binary(VALUE pkg,VALUE tag,VALUE val)
 {
@@ -312,6 +364,10 @@ rpm_package_add_binary(VALUE pkg,VALUE tag,VALUE val)
   return Qnil;
 }
 
+/*
+ * Deletes a tag of the package header
+ * @param [Number] tag Tag
+ */
 VALUE
 rpm_package_delete_tag(VALUE pkg, VALUE tag)
 {
@@ -323,10 +379,18 @@ rpm_package_delete_tag(VALUE pkg, VALUE tag)
 	return val;
 }
 
-#if RPM_VERSION_CODE < RPM_VERSION(4,6,0)
+/*
+ * Access a header entry
+ * @param [Number] tag Tag to return
+ * @return [] Value of the entry
+ * @example
+ *   pkg => #<RPM::Package name="xmlgraphics-fop", version=#<RPM::Version v="1.0", r="22.4">>
+ *   pkg[RPM::TAG_NAME] => "xmlgraphics-fop"
+ */
 VALUE
 rpm_package_aref(VALUE pkg, VALUE tag)
 {
+#if RPM_VERSION_CODE < RPM_VERSION(4,6,0) || RPM_VERSION_CODE >= RPM_VERSION(5,0,0)
 	rpmTag tagval = NUM2INT(tag);
 	VALUE val = Qnil;
 	void* data;
@@ -376,7 +440,9 @@ rpm_package_aref(VALUE pkg, VALUE tag)
 		val = rb_str_new(data, count);
 		break;
 
+#if RPM_VERSION_CODE < RPM_VERSION(5,0,0)
 	case RPM_CHAR_TYPE:
+#endif
 	case RPM_INT8_TYPE:
 		if (count == 1 && !ary_p) {
 			val = INT2NUM(*(int_8*)data);
@@ -462,9 +528,6 @@ rpm_package_aref(VALUE pkg, VALUE tag)
 	return val;
 }
 #else
-VALUE
-rpm_package_aref(VALUE pkg, VALUE tag)
-{
 	rpmTag tagval = NUM2INT(tag);
 	VALUE val = Qnil;
     rpmtd tagc = rpmtdNew();
@@ -612,6 +675,9 @@ rpm_package_sprintf(VALUE pkg, VALUE fmt)
 	return rb_str_new2(str);
 }
 
+/*
+ * @return [String] This package name
+ */
 VALUE
 rpm_package_get_name(VALUE pkg)
 {
@@ -623,6 +689,9 @@ rpm_package_get_name(VALUE pkg)
 	return name;
 }
 
+/*
+ * @return [String] This package architecture
+ */
 VALUE
 rpm_package_get_arch(VALUE pkg)
 {
@@ -634,6 +703,9 @@ rpm_package_get_arch(VALUE pkg)
 	return arch;
 }
 
+/*
+ * @return [Number] This package signature
+ */
 VALUE
 rpm_package_get_signature(VALUE pkg)
 {
@@ -652,6 +724,9 @@ rpm_package_get_signature(VALUE pkg)
 	return signature;
 }
 
+/*
+ * @return [Version] Version for this package
+ */
 VALUE
 rpm_package_get_version(VALUE pkg)
 {
@@ -679,6 +754,9 @@ rpm_package_get_version(VALUE pkg)
 	return ver;
 }
 
+/*
+ * @return [Array<RPM::File>] File list for this package
+ */
 VALUE
 rpm_package_get_files(VALUE pkg)
 {
@@ -735,7 +813,7 @@ rpm_package_get_files(VALUE pkg)
 	return files;
 }
 
-#if RPM_VERSION_CODE < RPM_VERSION(4,6,0)
+#if RPM_VERSION_CODE < RPM_VERSION(4,6,0) || RPM_VERSION_CODE >= RPM_VERSION(5,0,0)
 VALUE
 rpm_package_get_dependency(VALUE pkg,int nametag,int versiontag,int flagtag,VALUE (*dependency_new)(const char*,VALUE,int,VALUE))
 {
@@ -802,7 +880,7 @@ rpm_package_get_dependency(VALUE pkg,int nametag,int versiontag,int flagtag,VALU
     while ( rpmtdNext(nametd) != -1 ) {
         rb_ary_push(deps,dependency_new(rpmtdGetString(nametd),rpm_version_new(rpmtdNextString(versiontd)),*rpmtdNextUint32(flagtd),pkg));
     }
-    
+
  leave:
     rpmtdFree(nametd);
     rpmtdFree(versiontd);
@@ -811,34 +889,49 @@ rpm_package_get_dependency(VALUE pkg,int nametag,int versiontag,int flagtag,VALU
 }
 #endif
 
+/*
+ * @return [Array<RPM::Provide>] Provides list for this package
+ */
 VALUE
 rpm_package_get_provides(VALUE pkg)
 {
 	return rpm_package_get_dependency(pkg,RPMTAG_PROVIDENAME,RPMTAG_PROVIDEVERSION,RPMTAG_PROVIDEFLAGS,rpm_provide_new);
 }
 
+/*
+ * @return [Array<RPM::Require>] Require list for this package
+ */
 VALUE
 rpm_package_get_requires(VALUE pkg)
 {
 	return rpm_package_get_dependency(pkg,RPMTAG_REQUIRENAME,RPMTAG_REQUIREVERSION,RPMTAG_REQUIREFLAGS,rpm_require_new);
 }
 
+/*
+ * @return [Array<RPM::Conflict>] Conflict list for this package
+ */
 VALUE
 rpm_package_get_conflicts(VALUE pkg)
 {
 	return rpm_package_get_dependency(pkg,RPMTAG_CONFLICTNAME,RPMTAG_CONFLICTVERSION,RPMTAG_CONFLICTFLAGS,rpm_conflict_new);
 }
 
+/*
+ * @return [Array<RPM::Obsolete>] Obsoletes list for this package
+ */
 VALUE
 rpm_package_get_obsoletes(VALUE pkg)
 {
 	return rpm_package_get_dependency(pkg,RPMTAG_OBSOLETENAME,RPMTAG_OBSOLETEVERSION,RPMTAG_OBSOLETEFLAGS,rpm_obsolete_new);
 }
 
-#if RPM_VERSION_CODE < RPM_VERSION(4,6,0)
+/*
+ * @return [Array<RPM::Changelog>] changelog of the package as an array of entries
+ */
 VALUE
 rpm_package_get_changelog(VALUE pkg)
 {
+#if RPM_VERSION_CODE < RPM_VERSION(4,6,0) || RPM_VERSION_CODE >= RPM_VERSION(5,0,0)
 	VALUE cl;
 	register int i;
 
@@ -875,9 +968,6 @@ rpm_package_get_changelog(VALUE pkg)
 	return cl;
 }
 #else
-VALUE
-rpm_package_get_changelog(VALUE pkg)
-{
 	VALUE cl;
 	rpmtd timetd = rpmtdNew();
 	rpmtd nametd = rpmtdNew();
@@ -945,6 +1035,10 @@ rpm_package__dump(VALUE pkg, VALUE limit)
 	return rpm_package_dump(pkg);
 }
 
+/*
+ * String representation of the package: "name-version-release-arch"
+ * @return [String]
+ */
 VALUE
 rpm_package_to_s(VALUE pkg)
 {

data/ext/rpm/private.h

@@ -19,15 +19,28 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+/* Looks missing in rpmds.h */
+#include <sys/utsname.h>
 #include <unistd.h>
 
+#if RPM_VERSION(5,0,0) <= RPM_VERSION_CODE
+#include <stdint.h>
+#include <rpm4compat.h>
+#endif
+
+/* To get structure definitions */ 
+#define _RPMDB_INTERNAL 
+#define _RPMPS_INTERNAL
+
 #include <rpm/rpmcli.h>
-#include <rpm/rpmlib.h>
+#if HAVE_RPM_RPMLIB_H
+#  include <rpm/rpmlib.h>
+#endif
 #include <rpm/rpmdb.h>
 #include <rpm/rpmbuild.h>
 #if HAVE_RPM_RPMLOG_H
 #  include <rpm/rpmlog.h>
-#else
+#elif HAVE_RPMMESSAGES_H
 #  include <rpm/rpmmessages.h>
 #endif
 #if HAVE_RPM_RPMTS_H
@@ -58,9 +71,14 @@
 #define RPM_SCRIPT_FD(v) (((rpm_trans_t*)DATA_PTR((v)))->script_fd)
 
 #if RPM_VERSION_CODE >= RPM_VERSION(4,5,90)
+#if RPM_VERSION_CODE < RPM_VERSION(5,0,0)
 #define RPMDB_OPAQUE 1
 #define RPMPS_OPAQUE 1
 #else
+#define RPMDB_OPAQUE 1
+/* #undef RPMPS_OPAQUE */
+#endif
+#else
 #define RPMTS_AVAILABLE 1
 #endif
 
@@ -122,12 +140,21 @@ get_entry(Header hdr, rpmTag tag, rpmTagType* type, void** ptr)
 		*ptr = NULL;
 	}
 }
-#else
+#elif RPM_VERSION_CODE < RPM_VERSION(5,0,0)
 inline static void
 get_entry(Header hdr, rpmTag tag, rpmtd tc)
 {
 	headerGet(hdr, tag, tc, HEADERGET_MINMEM);
 }
+#else /* rpm4compat.h */
+inline static void
+get_entry(Header hdr, rpmTag tag, rpmTagType* type, void** ptr)
+{
+	if (!headerGetEntry(
+			hdr, (int_32)tag, (hTYP_t)type, ptr, NULL)) {
+		*ptr = NULL;
+	}
+}
 #endif
 
 inline static void

data/ext/rpm/rpm.c

@@ -16,6 +16,10 @@ m_expand(VALUE m, VALUE name)
 	return rb_str_new2(rpmExpand(StringValueCStr(name), NULL));
 }
 
+/*
+ * @param [String] name Name of the macro
+ * @return [String] value of macro +name+
+ */
 static VALUE
 m_aref(VALUE m, VALUE name)
 {
@@ -46,6 +50,11 @@ rpm_macro_aref(VALUE name)
 	return m_aref(Qnil, name);
 }
 
+/*
+ * Setup a macro
+ * @param [String] name Name of the macro
+ * @param [String] value Value of the macro or +nil+ to delete it
+ */
 static VALUE
 m_aset(VALUE m, VALUE name, VALUE val)
 {
@@ -67,6 +76,9 @@ rpm_macro_aset(VALUE name, VALUE val)
 	return m_aset(Qnil, name, val);
 }
 
+/*
+ * Read configuration files
+ */
 static VALUE
 m_readrc(int argc, VALUE* argv, VALUE m)
 {
@@ -134,6 +146,9 @@ rpm_init_marcros(const char* path)
 
 static int rpm_verbosity;
 
+/*
+ * @return [Number] Verbosity level
+ */
 static VALUE
 m_get_verbosity(VALUE m)
 {
@@ -146,6 +161,10 @@ rpm_get_verbosity(void)
 	return INT2NUM(rpm_verbosity);
 }
 
+/*
+ * Sets the verbosity level
+ * @param [Number] verbosity Verbosity level
+ */
 static VALUE
 m_set_verbosity(VALUE m, VALUE verbosity)
 {
@@ -188,11 +207,11 @@ Init_rpm(void)
 {
 	char *temp;
     VALUE rbtmpdir;
-    
+
     rb_require("tmpdir");
 
     rbtmpdir = rb_funcall(rb_const_get(rb_cObject,
-                                       rb_intern("Dir")), 
+                                       rb_intern("Dir")),
                           rb_intern("tmpdir"), 0);
 	rpm_mRPM = rb_define_module("RPM");
 
@@ -500,7 +519,9 @@ Init_rpm(void)
 	DEF_TRANS_FLAG(NOTRIGGERS);
 	DEF_TRANS_FLAG(NODOCS);
 	DEF_TRANS_FLAG(ALLFILES);
+#if RPM_VERSION_CODE < RPM_VERSION(5,0,0)
 	DEF_TRANS_FLAG(KEEPOBSOLETE);
+#endif
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	DEF_TRANS_FLAG(MULTILIB);
 #endif
@@ -510,7 +531,9 @@ Init_rpm(void)
 	DEF_TRANS_FLAG(PKGUNDO);
 	DEF_TRANS_FLAG(COMMIT);
 	DEF_TRANS_FLAG(UNDO);
+#if RPM_VERSION_CODE < RPM_VERSION(4,4,8)
 	DEF_TRANS_FLAG(REVERSE);
+#endif
 	DEF_TRANS_FLAG(NOTRIGGERPREIN);
 	DEF_TRANS_FLAG(NOPRE);
 	DEF_TRANS_FLAG(NOPOST);
@@ -523,7 +546,7 @@ Init_rpm(void)
 	DEF_TRANS_FLAG(APPLYONLY);
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	DEF_TRANS_FLAG(CHAINSAW);
-#elif RPM_VERSION_CODE < RPM_VERSION(4,5,90)
+#elif RPM_VERSION_CODE < RPM_VERSION(4,4,8)
 	DEF_TRANS_FLAG(ANACONDA);
 #endif
 /* NOMD5 is not in jbj's 4.4.6 any more - Mandriva uses that */
@@ -531,10 +554,12 @@ Init_rpm(void)
 	DEF_TRANS_FLAG(NOMD5);
 #endif
 #if RPM_VERSION(4,1,0) <= RPM_VERSION_CODE
+#if RPM_VERSION(4,4,8) < RPM_VERSION_CODE
 	DEF_TRANS_FLAG(NOSUGGEST);
 	DEF_TRANS_FLAG(ADDINDEPS);
 	DEF_TRANS_FLAG(NOCONFIGS);
 #endif
+#endif
 #undef DEF_TRANS_FLAG
 
 #define DEF_PROB_FILTER(name) \
@@ -650,6 +675,15 @@ Init_rpm(void)
 	rb_gc_register_address(&ruby_rpm_temp_format);
 
 	rpmReadConfigFiles(NULL, NULL);
+
+#if RPM_VERSION_CODE < RPM_VERSION(4,4,8)
 	rpmInitMacros(NULL, macrofiles);
+#elif RPM_VERSION_CODE < RPM_VERSION(4,5,90)
+	rpmInitMacros(NULL, rpmMacrofiles);
+#elif RPM_VERSION_CODE < RPM_VERSION(5,0,0)
+	rpmInitMacros(NULL, macrofiles);
+#else
+	rpmInitMacros(NULL, rpmMacrofiles);
+#endif
 	rpmSetVerbosity(RPMLOG_EMERG);
 }