equal
deleted
inserted
replaced
380 |
380 |
381 COPY_FILES += $(CACERTS_DST) |
381 COPY_FILES += $(CACERTS_DST) |
382 |
382 |
383 ########################################################################################## |
383 ########################################################################################## |
384 |
384 |
|
385 BLACKLISTED_CERTS_SRC := $(JDK_TOPDIR)/src/share/lib/security/blacklisted.certs |
|
386 BLACKLISTED_CERTS_DST := $(JDK_OUTPUTDIR)/lib/security/blacklisted.certs |
|
387 |
385 ifndef OPENJDK |
388 ifndef OPENJDK |
386 |
389 |
387 BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist |
390 BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist |
388 BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist |
391 BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist |
389 |
392 |
|
393 BLACKLISTED_CERTS_SRC += $(wildcard $(JDK_TOPDIR)/src/closed/share/lib/security/blacklisted.certs) |
|
394 |
390 TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries |
395 TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries |
391 TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries |
396 TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries |
392 |
397 |
393 $(BLACKLIST_DST): $(BLACKLIST_SRC) |
398 $(BLACKLIST_DST): $(BLACKLIST_SRC) |
394 $(call install-file) |
399 $(call install-file) |
399 $(call install-file) |
404 $(call install-file) |
400 |
405 |
401 COPY_FILES += $(TRUSTEDLIBS_DST) |
406 COPY_FILES += $(TRUSTEDLIBS_DST) |
402 |
407 |
403 endif |
408 endif |
|
409 |
|
410 $(BLACKLISTED_CERTS_DST): $(BLACKLISTED_CERTS_SRC) |
|
411 $(MKDIR) -p $(@D) |
|
412 $(CAT) $^ | $(SED) '/^$$/d' | $(SORT) | $(UNIQ) > $@.tmp |
|
413 $(GREP) -i Algorithm $@.tmp > $@ |
|
414 if [ `$(SED) -n -e "$$=" $@` != 1 ]; then \ |
|
415 $(ECHO) "Different algorithms defined in $^"; \ |
|
416 $(RM) $@ $@.tmp; \ |
|
417 false; \ |
|
418 fi |
|
419 $(GREP) -iv Algorithm $@.tmp >> $@ |
|
420 $(RM) $@.tmp |
|
421 |
|
422 COPY_FILES += $(BLACKLISTED_CERTS_DST) |
404 |
423 |
405 ########################################################################################## |
424 ########################################################################################## |
406 |
425 |
407 ifndef OPENJDK |
426 ifndef OPENJDK |
408 |
427 |