Makefile

@@ -1,32 +1,22 @@
 install_assp = /opt/assp
 assp.service = $(CHROOT)/lib/systemd/system/assp.service
 
-ASSP_SNAPSHOT ?= r397
-ASSP_MOD_INST_VER ?= 2.12
+ASSP_SNAPSHOT ?= r362
+ASSP_MOD_INST_VER ?= 2.10
 ASSP_FC_VER ?= 1.05
 ASSP_ZIP = assp-svn-$(ASSP_SNAPSHOT).zip
 ASSP_URL = https://sourceforge.net/code-snapshots/svn/a/as/assp/svn/$(ASSP_ZIP)
-LEOCHARRE-Debug = LEOCHARRE-Debug-1.03
 
 $(CHROOT)$(install_assp):
-	if [ ! -f $(DISTDIR)/$(ASSP_ZIP) ] ; \
-		then curl -L $(ASSP_URL) -o ${DISTDIR}/$(ASSP_ZIP); \
-	fi
+##	RUN test -f /var/cache/distfiles/$(ASSP_ZIP) || \
+##		RUN wget $(ASSP_URL) -O /var/cache/distfiles/$(ASSP_ZIP)
 	RUN sh -c '(echo y;echo manual;echo o conf prerequisites_policy follow;echo o conf commit)|cpan'
 	RUN sh -c 'cd /opt && unzip /var/cache/distfiles/$(ASSP_ZIP) && mv /opt/assp-svn-$(ASSP_SNAPSHOT)/assp2/trunk $(install_assp) && rm -rf /opt/assp-svn-$(ASSP_SNAPSHOT)'
 	echo "AsADaemon:=1" > $(CHROOT)$(install_assp)/assp.cfg
-	echo "runAsUser:=assp" > $(CHROOT)$(install_assp)/assp.cfg
-	echo "runAsGroup:=assp" > $(CHROOT)$(install_assp)/assp.cfg
-	tar -C $(CHROOT)/var/tmp -xzf assp/$(LEOCHARRE-Debug).tar.gz
-	RUN sh -c 'cd /var/tmp/$(LEOCHARRE-Debug) && perl Makefile.PL && make test && make install && rm -rf /var/tmp/$(LEOCHARRE-Debug)'
 	RUN sh -c 'mkdir -p /tmp/mod_inst && cd /tmp/mod_inst && unzip $(install_assp)/mod_inst.pl.$(ASSP_MOD_INST_VER).zip && perl mod_inst.pl && perl mod_inst_ocr.pl'
 	RUN sh -c 'cd $(install_assp) && unzip images/images.zip && rm images/images.zip'
 	RUN sh -c 'cd $(install_assp) && unzip filecommander/$(ASSP_FC_VER).ZIP && rm -rf filecommander/$(ASSP_FC_VER).ZIP && mv $(ASSP_FC_VER)/images/* images/ && mv $(ASSP_FC_VER)/lib/* lib/ && rm -rf $(ASSP_FC_VER)'
 	rm -rf $(CHROOT)/root/.cpan/build $(CHROOT)/root/.cpan/sources
-	-RUN useradd -M -r -G clamav,users,wheel -d /opt/assp -s /bin/bash --uid 237 --user-group --comment "Anti-Spam SMTP Proxy Server" assp
-	RUN passwd -l assp;
-	RUN chown -R assp:assp $(install_assp)
-
 
 $(assp.service): assp/assp.service
 	cp $< $@
@@ -34,4 +24,3 @@ $(assp.service): assp/assp.service
 preinstall:
 
 postinstall: $(CHROOT)$(install_assp) $(assp.service)
-	RUN sh -c 'USE=berkdb $(EMERGE) $(USEPKG) --oneshot dev-lang/perl'

package.use

@@ -1,4 +1,4 @@
-dev-lang/perl ithreads
+dev-lang/perl berkdb ithreads
 mail-mta/postfix cdb ldap mysql
 app-text/tesseract jpeg png tiff webp
 media-libs/leptonica tiff webp jpeg png