diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-07-06 17:09:57 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-07-06 17:09:57 +0000 |
| commit | ec69b9504eecb205cb2599cbe8418c4ba94def89 (patch) | |
| tree | 126519caec35570c2a7030897103f05084a95184 /emulators/qemu-devel/files/patch-include-qemu-aes.h | |
| parent | Update to the 20130630 snapshot of GCC 4.9.0. (diff) | |
- Update to 1.5.1, announce message is here:
https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04798.html
- Simplify bsd-user ld script handling. [1]
- Make STATIC_LINK work again.
- Add GTK knob.
- Neither graphical UI can be built static, set IGNORE in that case.
- Properly fix AES_* link errors by #defining those functions as
QEMU_AES_* to avoid conflicts with AES_* in -lcrypto needed (at
least) by -lcurl.
- Add back CURL knob in the process.
- Fix "Warning: vlan %d is not connected to host network" when using
pcap.
- Switch to USES= gmake.
- Note: I did not backport sson's latest bsd-user patches which he has
now in a github tree based on qemu git head, tho I have a seperate
port of that tree on redports:
svn co https://svn.redports.org/nox/emulators/qemu-devel-sson/
See also:
https://wiki.freebsd.org/QemuUserModeHowTo
Submitted by: emaste [1]
Diffstat (limited to 'emulators/qemu-devel/files/patch-include-qemu-aes.h')
| -rw-r--r-- | emulators/qemu-devel/files/patch-include-qemu-aes.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/emulators/qemu-devel/files/patch-include-qemu-aes.h b/emulators/qemu-devel/files/patch-include-qemu-aes.h new file mode 100644 index 000000000000..7c9b8d1d52d9 --- /dev/null +++ b/emulators/qemu-devel/files/patch-include-qemu-aes.h @@ -0,0 +1,18 @@ +--- a/include/qemu/aes.h ++++ b/include/qemu/aes.h +@@ -10,6 +10,15 @@ struct aes_key_st { + }; + typedef struct aes_key_st AES_KEY; + ++/* FreeBSD has it's own AES_set_decrypt_key in -lcrypto, avoid conflicts */ ++#ifdef __FreeBSD__ ++#define AES_set_encrypt_key QEMU_AES_set_encrypt_key ++#define AES_set_decrypt_key QEMU_AES_set_decrypt_key ++#define AES_encrypt QEMU_AES_encrypt ++#define AES_decrypt QEMU_AES_decrypt ++#define AES_cbc_encrypt QEMU_AES_cbc_encrypt ++#endif ++ + int AES_set_encrypt_key(const unsigned char *userKey, const int bits, + AES_KEY *key); + int AES_set_decrypt_key(const unsigned char *userKey, const int bits, |