~ubuntu-branches/ubuntu/trusty/openssl/trusty

« back to all changes in this revision

Viewing changes to apps/Makefile

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-01-08 15:57:24 UTC
  • mfrom: (11.1.46 sid)
  • Revision ID: package-import@ubuntu.com-20140108155724-kl61on9fyqmod2z9
Tags: 1.0.1f-1ubuntu1
* Merge with Debian, remaining changes.
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification on libssl1.0.0
      upgrade on servers.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i586 (on i386)
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
  - debian/control: Mark Debian Vcs-* as XS-Debian-Vcs-*
  - debian/patches/ubuntu_deb676533_arm_asm.patch: Enable arm assembly
    code.
  - debian/rules: Enable optimized 64bit elliptic curve code contributed
    by Google.
* Dropped changes:
  - debian/patches/arm64-support: included in debian-targets.patch
  - debian/patches/no_default_rdrand.patch: upstream
  - debian/patches/openssl-1.0.1e-env-zlib.patch: zlib is now completely
    disabled in debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
577
577
openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
578
578
openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
579
579
openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
580
 
openssl.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
581
 
openssl.o: ../include/openssl/sha.h ../include/openssl/srtp.h
582
 
openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
583
 
openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
584
 
openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
585
 
openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
586
 
openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
587
 
openssl.o: ../include/openssl/x509v3.h apps.h openssl.c progs.h s_apps.h
 
580
openssl.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 
581
openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 
582
openssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 
583
openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 
584
openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 
585
openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 
586
openssl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 
587
openssl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 
588
openssl.o: openssl.c progs.h s_apps.h
588
589
passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
589
590
passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
590
591
passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h