[Fedora-directory-commits] dsbuild/ds/icu .cvsignore, NONE, 1.1 Makefile, 1.2, 1.3 checksums, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/icu
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/icu
Modified Files:
Makefile checksums
Added Files:
.cvsignore
Log Message:
updated for Fedora DS 1.1
--- NEW FILE .cvsignore ---
download
work
cookies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/icu/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:28:51 -0000 1.2
+++ Makefile 8 Feb 2008 21:51:55 -0000 1.3
@@ -1,33 +1,27 @@
-GARNAME = icu
-GARVERSION = 3.4
+GARNAME = icu4c
+GARVERSION = 3_8_1
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tgz
+DISTFILES = $(GARNAME)-$(GARVERSION)-src.tgz
PATCHFILES =
-
LIBDEPS =
-DESCRIPTION = icu
+DESCRIPTION = ICU
+
+WORKSRC = work/icu
CONFIGURE_SCRIPTS = custom
BUILD_SCRIPTS = $(WORKSRC)/source/Makefile
-INSTALL_SCRIPTS = custom
+INSTALL_SCRIPTS = $(WORKSRC)/source/Makefile
ifdef DEBUG
DEBUGFLAG = --enable-debug
endif
-CONFIGURE_ARGS = LinuxRedHat --prefix=`pwd`/../built --enable-rpath --disable-ustdio $(DEBUGFLAG)
+CONFIGURE_ARGS = LinuxRedHat --enable-rpath --disable-ustdio $(DEBUGFLAG)
configure-custom:
- if test -d $(WORKSRC); then \
- rmdir $(WORKSRC) ;\
- mv work/icu $(WORKSRC) ;\
- fi
- cd $(WORKSRC)/source && ./runConfigureICU $(CONFIGURE_ARGS)
- $(MAKECOOKIE)
-
-install-custom:
- cd $(WORKSRC)/source && $(MAKE) install
+ @echo ' $(call TMSG_LIB,Running runConfigureICU in,$(WORKSRC)/source)'
+ cd $(WORKSRC)/source && $(CONFIGURE_ENV) ./runConfigureICU $(CONFIGURE_ARGS)
$(MAKECOOKIE)
include ../../gar.conf.mk
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checksums 24 Feb 2006 17:23:38 -0000 1.3
+++ checksums 8 Feb 2008 21:51:55 -0000 1.4
@@ -1 +1 @@
-b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz
+a827dbc9d909febd4ec39b90386868ba download/icu4c-3_8_1-src.tgz
16 years, 2 months
[Fedora-directory-commits] dsbuild/ds/db .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/db
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/db
Modified Files:
Makefile checksums
Added Files:
.cvsignore
Log Message:
updated for Fedora DS 1.1
--- NEW FILE .cvsignore ---
download
work
cookies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/db/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 8 Feb 2008 21:51:53 -0000 1.2
@@ -2,40 +2,37 @@
GARVERSION = 4.2.52.NC
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff
+PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff 4.2.52.5.diff
LIBDEPS =
DESCRIPTION = db
CONFIGURE_SCRIPTS = custom
-BUILD_SCRIPTS = custom
-INSTALL_SCRIPTS = custom
+BUILD_SCRIPTS = $(WORKSRC)/built/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/built/Makefile
CONFIGURE_ARGS = --enable-dynamic
+CONFIGURE_ENV += LIBSO_LIBS=-lpthread
+
ifdef DEBUG
CONFIGURE_ARGS += --enable-debug --enable-umrw
-CONFIGURE_ENV = CFLAGS=-g
else
CONFIGURE_ARGS += --disable-debug
-CONFIGURE_ENV = CFLAGS=-O2
endif
-BUILD_ARGS = LIBDB_ARGS="libdb.a"
+BUILD_ARGS = LIBDB_ARGS="libdb-4.2.a"
-configure-custom:
+# db does not allow you to run configure directly from the source "dist"
+# directory, so you have to create a "built" directory and copy
+# configure into there
+pre-configure:
mkdir -p $(WORKSRC)/built
- cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS)
- $(MAKECOOKIE)
-build-custom:
- cd $(WORKSRC)/built && $(MAKE) $(BUILD_ARGS)
- cd $(WORKSRC)/built && rm -f db_archive db_checkpoint db_deadlock \
- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
- cd $(WORKSRC)/built && $(MAKE) LDFLAGS="-static " libdb.a all
-
-install-custom:
+configure-custom:
+ @echo ' $(call TMSG_LIB,Running configure in,$(WORKSRC)/built)'
+ cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS)
$(MAKECOOKIE)
include ../../gar.conf.mk
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/db/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 8 Feb 2008 21:51:53 -0000 1.2
@@ -3,3 +3,4 @@
1ca0c3556ccfd3af178da2ccc8724ba2 download/4.2.52.2.diff
f904e0eac44c6cac865de9c33cd4965e download/4.2.52.3.diff
9e1bcadecd6a137245ad831bc9021e38 download/4.2.52.4.diff
+de8f8dc57b7d878905910a94330eece5 download/4.2.52.5.diff
16 years, 2 months
[Fedora-directory-commits] dsbuild/ds/cyrus-sasl .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/cyrus-sasl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/cyrus-sasl
Modified Files:
Makefile checksums
Added Files:
.cvsignore
Log Message:
updated for Fedora DS 1.1
--- NEW FILE .cvsignore ---
download
work
cookies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 8 Feb 2008 21:51:52 -0000 1.2
@@ -1,9 +1,9 @@
GARNAME = cyrus-sasl
-GARVERSION = 2.1.20
+GARVERSION = 2.1.22
CATEGORIES = ds
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
-MYPATCH = cyrus-sasl-2.1.20-gcc4.patch
+MYPATCH =
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH)
PATCHFILES =
@@ -13,9 +13,11 @@
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
-CONFIGURE_ARGS = --enable-static --enable-gssapi=/usr/kerberos/include --without-des --without-openssl
+#CONFIGURE_ARGS = --enable-gssapi=/usr/kerberos/include --without-des --without-openssl
+CONFIGURE_ARGS = --enable-gssapi --without-des --without-openssl \
+ --with-dblib=none --with-plugindir=$(PREFIX)/lib/sasl2
ifdef DEBUG
CONFIGURE_ENV = CFLAGS=-g
@@ -24,12 +26,11 @@
endif
# this is our "custom" patch target
+ifdef MYPATCH
post-patch:
cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 )
$(MAKECOOKIE)
-
-install-custom:
- $(MAKECOOKIE)
+endif
include ../../gar.conf.mk
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 8 Feb 2008 21:51:53 -0000 1.2
@@ -1,2 +1 @@
-268ead27f4ac39bcfe17d9e38e0f2977 download/cyrus-sasl-2.1.20.tar.gz
-55e7a90561d9b02e0e7e0d598f5f6356 download/cyrus-sasl-2.1.20-gcc4.patch
+45dde9d19193ae9dd388eb68b2027bc9 download/cyrus-sasl-2.1.22.tar.gz
16 years, 2 months
[Fedora-directory-commits] dsbuild/ds/db/files 4.2.52.5.diff, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/db/files
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/db/files
Added Files:
4.2.52.5.diff
Log Message:
updated for Fedora DS 1.1
4.2.52.5.diff:
--- NEW FILE 4.2.52.5.diff ---
*** work/db-4.2.52.NC/mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700
--- work/db-4.2.52.NC/mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700
***************
*** 553,560 ****
*/
if (state != SECOND_MISS && bhp->ref == 1) {
bhp->priority = UINT32_T_MAX;
! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
hp->hash_priority =
SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
}
--- 553,563 ----
*/
if (state != SECOND_MISS && bhp->ref == 1) {
bhp->priority = UINT32_T_MAX;
! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
! }
hp->hash_priority =
SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
}
16 years, 2 months
[Fedora-directory-commits] dsbuild/ds/adminutil .cvsignore, NONE, 1.1 Makefile, 1.6, 1.7 checksums, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/adminutil
Modified Files:
Makefile checksums
Added Files:
.cvsignore
Log Message:
updated for Fedora DS 1.1
--- NEW FILE .cvsignore ---
download
work
cookies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 6 Nov 2006 21:51:28 -0000 1.6
+++ Makefile 8 Feb 2008 21:51:51 -0000 1.7
@@ -1,42 +1,29 @@
include ../../objdirname.mk
-GARNAME = fedora-adminutil
-GARVERSION = 1.0.4
+GARNAME = adminutil
+GARVERSION = 1.1.5
CATEGORIES = ds
PATCHFILES =
ifdef USE_CVS
CVSMODULES=adminutil
else
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
endif
LIBDEPS =
DESCRIPTION = adminutil
-#CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS)
BUILD_SCRIPTS = $(WORKSRC)/Makefile
-#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
-BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME)
-
-ifeq ($(DEBUG), full)
-BUILD_ARGS += DEBUG=full
-else
-BUILD_ARGS += BUILD_DEBUG=optimize
-endif
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
ifdef USE_CVS
post-extract: extract-cvs
endif
-configure-custom:
- $(MAKECOOKIE)
-
-install-custom:
- $(MAKECOOKIE)
-
include ../../gar.conf.mk
include ../category.mk
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- checksums 8 Nov 2006 04:13:41 -0000 1.10
+++ checksums 8 Feb 2008 21:51:51 -0000 1.11
@@ -1 +1 @@
-8bafc54cdc08e3886b6a68d0ac9367a0 download/fedora-adminutil-1.0.4.tar.gz
+1ce95159db07040d7095b805e9b3b533 download/adminutil-1.1.5.tar.bz2
16 years, 2 months