Remove xca_db_stat application

INSTALL

@@ -67,7 +67,6 @@ setup.exe:  W32 installer
 snapshot :  Creates a current snapshot from the local git repository
 xca.app  :  Creates the MacOSX xca.app
 xca.dmg  :  Creates the MacOSX Disk image
-xca_db_stat: Creates the database analyzer
 
 Installing:
 ------------

Makefile

@@ -34,7 +34,6 @@ OSSLSIGN_OPT=sign -pkcs12 "$(HOME)"/Christian_Hohnstaedt.p12 -askpass \
 	-n "XCA $(VERSION)" -i https://hohnstaedt.de/xca \
 	-t http://timestamp.comodoca.com -h sha2 -verbose
 
-all: xca_db_stat$(SUFFIX)
 ifeq ($(SUFFIX), .exe)
 all: setup$(SUFFIX)
 export CFLAGS_XCA_DB_STAT=-mconsole
@@ -79,11 +78,6 @@ headers: do.ui commithash.h
 	$(MAKE) -C $* -f $(TOPDIR)/$*/Makefile \
 		VPATH=$(TOPDIR)/$*
 
-xca_db_stat$(SUFFIX): lib/.build-stamp
-	$(MAKE) -C lib -f $(TOPDIR)/lib/Makefile \
-		VPATH=$(TOPDIR)/lib $@
-	cp lib/$@ $@
-
 $(INSTTARGET): install.%: %/.build-stamp
 	mkdir -p $*
 	$(MAKE) -C $* -f $(TOPDIR)/$*/Makefile \
@@ -99,9 +93,9 @@ clean:
 				-o -name ".build-stamp" \
 				-o -name ".depend" \
 				-o -name "moc_*.cpp" | xargs rm -f
-	rm -f ui/ui_*.h lang/xca_*.qm doc/*.html doc/xca.1.gz doc/xca_db_stat.1.gz img/imgres.cpp
+	rm -f ui/ui_*.h lang/xca_*.qm doc/*.html doc/xca.1.gz img/imgres.cpp
 	rm -f lang/*.xml lang/.build-stamp misc/dn.txt misc/eku.txt misc/oids.txt
-	rm -f xca$(SUFFIX) setup_xca*.exe xca_db_stat$(SUFFIX) lib/xca_db_stat$(SUFFIX) *.dmg
+	rm -f xca$(SUFFIX) setup_xca*.exe *.dmg
 	rm -rf xca-$(VERSION)*
 
 distclean: clean
@@ -126,16 +120,15 @@ snapshot:
 	git archive --format=tar --prefix=xca-$${HASH}/ HEAD | \
 		gzip -9 > xca-$${HASH}.tar.gz
 
-install: xca$(SUFFIX) xca_db_stat$(SUFFIX) $(INSTTARGET)
+install: xca$(SUFFIX) $(INSTTARGET)
 	install -m 755 -d $(destdir)$(bindir)
 	install -m 755 xca $(destdir)$(bindir)
-	install -m 755 xca_db_stat $(destdir)$(bindir)
 	$(STRIP) $(destdir)$(bindir)/xca
 
 setup.exe: setup_xca-$(VERSION).exe
-setup_xca-$(VERSION).exe: xca$(SUFFIX) xca_db_stat$(SUFFIX) do.doc do.lang do.misc
+setup_xca-$(VERSION).exe: xca$(SUFFIX) do.doc do.lang do.misc
 setup_xca-$(VERSION).exe: misc/xca.nsi
-	for binary in xca$(SUFFIX) xca_db_stat$(SUFFIX); do \
+	for binary in xca$(SUFFIX); do \
 	  $(STRIP) xca$(SUFFIX); \
 	  if test -n "$(OSSLSIGN)"; then \
 	    $(OSSLSIGN) $(OSSLSIGN_OPT) -in $${binary} -out $${binary}.signed && \
@@ -150,17 +143,15 @@ setup_xca-$(VERSION).exe: misc/xca.nsi
 	fi
 
 
-$(DMGSTAGE): xca$(SUFFIX) xca_db_stat$(SUFFIX)
+$(DMGSTAGE): xca$(SUFFIX)
 	rm -rf $(DMGSTAGE)
 	mkdir -p $(DMGSTAGE)/xca.app/Contents/MacOS
 	mkdir -p $(DMGSTAGE)/xca.app/Contents/Resources
 	mkdir -p $(DMGSTAGE)/manual
 	ln -s /Applications $(DMGSTAGE)
 	install -m 644 $(TOPDIR)/COPYRIGHT $(DMGSTAGE)/COPYRIGHT.txt
 	install -m 755 xca $(DMGSTAGE)/xca.app/Contents/MacOS
-	install -m 755 xca_db_stat $(DMGSTAGE)/xca.app/Contents/MacOS
 	$(STRIP) $(DMGSTAGE)/xca.app/Contents/MacOS/xca
-	$(STRIP) $(DMGSTAGE)/xca.app/Contents/MacOS/xca_db_stat
 	$(MAKE) $(APPTARGET)
 	cp -r $(DMGSTAGE)/xca.app/Contents/Resources/*.html $(DMGSTAGE)/manual
 	ln -s xca.html $(DMGSTAGE)/manual/index.html

doc/Makefile

@@ -3,9 +3,9 @@ TOPDIR=..
 BUILD=..
 endif
 
-DELFILES=xca*.html xca.1.gz xca_db_stat.1.gz
+DELFILES=xca*.html xca.1.gz
 
-doc: xca.1.gz xca_db_stat.1.gz xca.html changelog.html
+doc: xca.1.gz xca.html changelog.html
 include $(TOPDIR)/Rules.mak
 
 %.1.gz: %.1

lib/Makefile

@@ -16,7 +16,3 @@ OBJS=$(patsubst %, %.o, $(NAMES)) $(patsubst %, moc_%.o, $(MOCNAMES))
 
 include $(TOPDIR)/Rules.mak
 sinclude .depend
-
-xca_db_stat$(SUFFIX): xca_db_stat.o db.o db.h
-	@$(PRINT) "  LINK   $@"
-	$(CC) $(CPPFLAGS) $(LDFLAGS) $(CFLAGS) $(CFLAGS_XCA_DB_STAT) xca_db_stat.o db.o $(LIBS) -g -o $@

lib/x509v3ext.cpp

@@ -860,11 +860,11 @@ static bool nameConstraint(STACK_OF(GENERAL_SUBTREE) *trees,
 		{
 			return false;
 		}
-		fprintf(stderr, "%s: %d '%s'\n", __func__, i, CCHAR(one));
+		qDebug("%s: %d '%s'\n", __func__, i, CCHAR(one));
 		sl << prefix + ";" + one;
 	}
 	*single = vlist2Section(sl, tag+prefix, sect);
-	fprintf(stderr, "Single: '%s'\n", CCHAR(*single));
+	qDebug("Single: '%s'\n", CCHAR(*single));
 	return true;
 }
 
@@ -892,7 +892,7 @@ bool x509v3ext::parse_nameConstraints(QString *, QString *adv) const
 
 	if (adv && retval &&permEx.size() > 0) {
 		ret = permEx.join(", ");
-		fprintf(stderr, "%s %d '%s'\n", __func__, retval, CCHAR(ret));
+		qDebug("%s %d '%s'\n", __func__, retval, CCHAR(ret));
 		*adv = QString("%1=%2\n").arg(tag).
 			arg(parse_critical() +ret) + *adv + sect;
 	}

misc/xca.nsi

@@ -67,7 +67,6 @@ Section "xca (required)" SecMain
   SetOutPath $INSTDIR
   ; Put files there
   File "xca.exe"
-  File "xca_db_stat.exe"
   File "misc\dn.txt"
   File "misc\eku.txt"
   File "misc\oids.txt"
@@ -88,16 +87,16 @@ Section "xca (required)" SecMain
   File "${INSTALLDIR}\bin\libcrypto-1_1.dll"
 
 
-  ; delete unneeded engine
+  ; delete unneeded files when updating
   Delete "$INSTDIR\libp11-1.dll"
   Delete "$INSTDIR\engine_pkcs11.dll"
   Delete "$INSTDIR\libeay32.dll"
   Delete "$INSTDIR\QtGui4.dll"
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\mingwm10.dll"
   Delete "$INSTDIR\aia.txt"
+  Delete "$INSTDIR\xca_db_stat.exe"
 
-  ; remove old images
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\xca "Install_Dir" "$INSTDIR"
 
@@ -209,7 +208,6 @@ Section "Uninstall"
   DeleteRegKey HKCU "SOFTWARE\xca"
   ; remove files
   Delete $INSTDIR\xca.exe
-  Delete $INSTDIR\xca_db_stat.exe
   Delete $INSTDIR\key.ico
   Delete $INSTDIR\key.xpm
   Delete $INSTDIR\*.dll