[35512] trunk/dports/sysutils/poldek

afb at macports.org afb at macports.org
Sat Mar 29 06:22:21 PDT 2008


Revision: 35512
          http://trac.macosforge.org/projects/macports/changeset/35512
Author:   afb at macports.org
Date:     2008-03-29 06:22:20 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
port upgrade: poldek 0.30 (cvs snapshot)

Modified Paths:
--------------
    trunk/dports/sysutils/poldek/Portfile
    trunk/dports/sysutils/poldek/files/patch-libpoldek.sym
    trunk/dports/sysutils/poldek/files/patch-realpath.diff

Added Paths:
-----------
    trunk/dports/sysutils/poldek/files/patch-libpoclidek.sym
    trunk/dports/sysutils/poldek/files/patch-libvfile.sym
    trunk/dports/sysutils/poldek/files/patch-obsoletes.c
    trunk/dports/sysutils/poldek/files/patch-rpmdb_it.c

Removed Paths:
-------------
    trunk/dports/sysutils/poldek/files/patch-libpolclidek.sym
    trunk/dports/sysutils/poldek/files/poldek-uri-escape-fix.patch

Modified: trunk/dports/sysutils/poldek/Portfile
===================================================================
--- trunk/dports/sysutils/poldek/Portfile	2008-03-29 13:12:27 UTC (rev 35511)
+++ trunk/dports/sysutils/poldek/Portfile	2008-03-29 13:22:20 UTC (rev 35512)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		poldek
-version		0.21-cvs20070703.00
+version		0.30-cvs20080225.00
 platforms	darwin
 categories	sysutils
 maintainers	afb at macports.org
@@ -20,15 +20,16 @@
 homepage	http://poldek.pld-linux.org/
 master_sites	${homepage}download/snapshots/
 use_bzip2	yes
-checksums	md5 dae23dec560fad954abf157fd250e4c3
+checksums	md5 22b2cfb19cebd123e8d8148fb6ca27de
 
 depends_lib	port:rpm port:argp-standalone port:ncurses \
 		lib:libpcre:pcre lib:libcheck:check lib:libxml2:libxml2
 
 
-patchfiles	poldek-uri-escape-fix.patch patch-pm.h \
+patchfiles	patch-obsoletes.c patch-rpmdb_it.c patch-pm.h \
 		patch-utillibs.diff patch-realpath.diff \
-		patch-rpmlog.diff patch-libpoldek.sym patch-libpolclidek.sym
+		patch-rpmlog.diff patch-libvfile.sym \
+		patch-libpoldek.sym patch-libpoclidek.sym
 use_autoconf	yes
 post-patch 	{ system "aclocal -I${prefix}/share/aclocal" }
 

Copied: trunk/dports/sysutils/poldek/files/patch-libpoclidek.sym (from rev 35467, trunk/dports/sysutils/poldek/files/patch-libpolclidek.sym)
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-libpoclidek.sym	                        (rev 0)
+++ trunk/dports/sysutils/poldek/files/patch-libpoclidek.sym	2008-03-29 13:22:20 UTC (rev 35512)
@@ -0,0 +1,10 @@
+--- cli/libpoclidek.sym.orig	2007-06-30 09:33:41.000000000 +0200
++++ cli/libpoclidek.sym	2007-08-29 23:14:51.000000000 +0200
+@@ -4,7 +4,6 @@ cmdctx_printf_c
+ pkg_dent_add_dir
+ pkg_dent_add_pkg
+ pkg_dent_add_pkgs
+-pkg_dent_adddir
+ pkg_dent_cmp
+ pkg_dent_cmp_bday
+ pkg_dent_cmp_btime

Deleted: trunk/dports/sysutils/poldek/files/patch-libpolclidek.sym
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-libpolclidek.sym	2008-03-29 13:12:27 UTC (rev 35511)
+++ trunk/dports/sysutils/poldek/files/patch-libpolclidek.sym	2008-03-29 13:22:20 UTC (rev 35512)
@@ -1,10 +0,0 @@
---- cli/libpoclidek.sym.orig	2007-06-30 09:33:41.000000000 +0200
-+++ cli/libpoclidek.sym	2007-08-29 23:14:51.000000000 +0200
-@@ -4,7 +4,6 @@ cmdctx_printf_c
- pkg_dent_add_dir
- pkg_dent_add_pkg
- pkg_dent_add_pkgs
--pkg_dent_adddir
- pkg_dent_cmp
- pkg_dent_cmp_bday
- pkg_dent_cmp_btime

Modified: trunk/dports/sysutils/poldek/files/patch-libpoldek.sym
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-libpoldek.sym	2008-03-29 13:12:27 UTC (rev 35511)
+++ trunk/dports/sysutils/poldek/files/patch-libpoldek.sym	2008-03-29 13:22:20 UTC (rev 35512)
@@ -1,6 +1,6 @@
---- libpoldek.sym.orig	2007-06-30 14:36:41.000000000 +0200
-+++ libpoldek.sym	2007-08-29 23:06:21.000000000 +0200
-@@ -94,12 +94,10 @@
+--- libpoldek.sym.orig	2008-02-02 15:57:54.000000000 +0100
++++ libpoldek.sym	2008-03-29 13:52:02.000000000 +0100
+@@ -95,12 +95,10 @@
  pkg_set_arch
  pkg_set_os
  pkg_snprintf
@@ -13,23 +13,15 @@
  pkg_stritime
  pkg_strsize
  pkg_uinf
-@@ -110,7 +108,6 @@
- pkgdb_get_conflicted_dbpkgs
- pkgdb_get_file_conflicted_dbpkgs
- pkgdb_get_obsoletedby_pkg
--pkgdb_get_obsoletedby_pkg_nevr
- pkgdb_get_pkgs_requires_capn
- pkgdb_get_provides_dbpkgs
- pkgdb_install
-@@ -188,7 +185,6 @@
- pm_get_pmcaps
- pm_load_package
- pm_machine_score
--pm_module_init
- pm_new
- pm_pminstall
- pm_pmuninstall
-@@ -220,8 +216,6 @@
+@@ -149,7 +147,6 @@
+ pkgfl_it_get_rawargs
+ pkgfl_it_init
+ pkgfl_it_new
+-pkgfl_restore
+ pkgfl_restore_st
+ pkgfl_skip_st
+ pkgfl_store
+@@ -203,8 +200,6 @@
  poldek_log_add_appender
  poldek_log_set_appender
  poldek_log_i
@@ -38,11 +30,3 @@
  poldek_new
  poldek_search_avail_packages
  poldek_set_verbose
-@@ -273,7 +267,6 @@
- poldek_vlog
- poldeklib_destroy
- poldeklib_init
--rpmlog
- sigint_destroy
- sigint_init
- sigint_pop

Added: trunk/dports/sysutils/poldek/files/patch-libvfile.sym
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-libvfile.sym	                        (rev 0)
+++ trunk/dports/sysutils/poldek/files/patch-libvfile.sym	2008-03-29 13:22:20 UTC (rev 35512)
@@ -0,0 +1,10 @@
+--- vfile/libvfile.sym.orig	2006-08-20 12:45:41.000000000 +0200
++++ vfile/libvfile.sym	2008-03-29 13:28:45.000000000 +0100
+@@ -25,7 +25,6 @@
+ vf_mkdir
+ vf_mksubdir
+ vf_progress
+-vf_progress_init
+ vf_request_close_destpath
+ vf_request_free
+ vf_request_new

Added: trunk/dports/sysutils/poldek/files/patch-obsoletes.c
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-obsoletes.c	                        (rev 0)
+++ trunk/dports/sysutils/poldek/files/patch-obsoletes.c	2008-03-29 13:22:20 UTC (rev 35512)
@@ -0,0 +1,18 @@
+--- install3/obsoletes.c.orig	2008-02-02 22:30:16.000000000 +0100
++++ install3/obsoletes.c	2008-03-29 13:23:17.000000000 +0100
+@@ -20,13 +20,14 @@
+ static struct orphan *orphan_new(struct pkg *pkg, tn_array *caps) 
+ {
+     struct orphan *o;
++    int i;
+ 
+     o = n_malloc(sizeof(*o));
+     o->pkg = pkg_link(pkg);
+     o->reqs = capreq_arr_new(4);
+     n_array_ctl_set_freefn(o->reqs, NULL); /* weak ref */
+     
+-    for (int i=0; i < n_array_size(caps); i++) {
++    for (i=0; i < n_array_size(caps); i++) {
+         const struct capreq *req;
+         struct capreq *cap = n_array_nth(caps, i);
+ 


Property changes on: trunk/dports/sysutils/poldek/files/patch-obsoletes.c
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/dports/sysutils/poldek/files/patch-realpath.diff
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-realpath.diff	2008-03-29 13:12:27 UTC (rev 35511)
+++ trunk/dports/sysutils/poldek/files/patch-realpath.diff	2008-03-29 13:22:20 UTC (rev 35512)
@@ -1,14 +1,20 @@
---- misc.c.orig	2007-07-02 20:30:48.000000000 +0200
-+++ misc.c	2007-08-29 22:11:51.000000000 +0200
-@@ -530,7 +530,10 @@
- #ifdef HAVE_CANONICALIZE_FILE_NAME /* have safe GNU ext? */
-     return realpath(path, NULL);
- #else
+--- misc.c.orig	2008-02-24 15:54:21.000000000 +0100
++++ misc.c	2008-03-29 12:43:31.000000000 +0100
+@@ -19,7 +19,16 @@
+ #endif
+ 
+ #ifndef HAVE_CANONICALIZE_FILE_NAME /* have safe GNU ext? */
 -# error "missing safe realpath()"
-+	{
-+		char *buf = malloc(PATH_MAX);
-+		if (buf) return realpath(path, buf);
-+	}
++#include <sys/param.h>
++#include <stdlib.h>
++static char * malloc_realpath(const char *pathname, char *resolved_path)
++{
++    char *buf = resolved_path;
++    if (buf == NULL) buf = malloc(PATH_MAX);
++    if (buf) return realpath(pathname, buf);
++    return NULL;
++}
++#define realpath malloc_realpath
  #endif
-     return NULL;
- }
+ 
+ #ifdef HAVE_STRSIGNAL

Added: trunk/dports/sysutils/poldek/files/patch-rpmdb_it.c
===================================================================
--- trunk/dports/sysutils/poldek/files/patch-rpmdb_it.c	                        (rev 0)
+++ trunk/dports/sysutils/poldek/files/patch-rpmdb_it.c	2008-03-29 13:22:20 UTC (rev 35512)
@@ -0,0 +1,13 @@
+--- pm/rpm//rpmdb_it.c.orig	2008-02-24 23:14:08.000000000 +0100
++++ pm/rpm//rpmdb_it.c	2008-03-29 13:24:07.000000000 +0100
+@@ -18,6 +18,10 @@
+ # include "config.h"
+ #endif
+ 
++#ifdef __APPLE__
++#include <sys/param.h>
++#endif
++
+ #define ENABLE_TRACE 0
+ #include "i18n.h"
+ #include "misc.h"


Property changes on: trunk/dports/sysutils/poldek/files/patch-rpmdb_it.c
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: trunk/dports/sysutils/poldek/files/poldek-uri-escape-fix.patch
===================================================================
--- trunk/dports/sysutils/poldek/files/poldek-uri-escape-fix.patch	2008-03-29 13:12:27 UTC (rev 35511)
+++ trunk/dports/sysutils/poldek/files/poldek-uri-escape-fix.patch	2008-03-29 13:22:20 UTC (rev 35512)
@@ -1,19 +0,0 @@
---- vfile/vfff/http.c.orig	2007-07-16 22:05:47.000000000 +0200
-+++ vfile/vfff/http.c	2007-07-16 22:06:10.000000000 +0200
-@@ -123,16 +123,8 @@
- 
- static char *make_req_line(char *buf, int size, const char *method, const char *uri) 
- {
--    char *escaped = NULL;
--    
--    if ((escaped = vfff_uri_escape(uri)))
--        uri = escaped;
--    
-     n_snprintf(buf, size, "%s %s HTTP/1.1\r\n", method, uri);
- 
--    if (escaped)
--        free(escaped);
--    
-     return buf;
- }
- 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080329/af87fa51/attachment-0001.html


More information about the macports-changes mailing list