diff --git a/.gitignore b/.gitignore index 09b193a..5fdb670 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /linuxptp-20121109git4e8107.tar.gz /linuxptp-1.0.tgz /linuxptp-1.1.tgz +/linuxptp-1.2.tgz diff --git a/linuxptp-aliasing.patch b/linuxptp-aliasing.patch deleted file mode 100644 index 77bb56d..0000000 --- a/linuxptp-aliasing.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/phc2sys.c -+++ b/phc2sys.c -@@ -352,12 +352,14 @@ static int is_msg_mgt(struct ptp_message *msg) - - static int get_mgt_id(struct ptp_message *msg) - { -- return ((struct management_tlv *) msg->management.suffix)->id; -+ struct management_tlv *mgt = (struct management_tlv *) msg->management.suffix; -+ return mgt->id; - } - - static void *get_mgt_data(struct ptp_message *msg) - { -- return ((struct management_tlv *) msg->management.suffix)->data; -+ struct management_tlv *mgt = (struct management_tlv *) msg->management.suffix; -+ return mgt->data; - } - - static int run_pmc(int wait_sync, int *utc_offset) diff --git a/linuxptp.spec b/linuxptp.spec index 801450c..8e97d73 100644 --- a/linuxptp.spec +++ b/linuxptp.spec @@ -1,5 +1,5 @@ Name: linuxptp -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: PTP implementation for Linux @@ -11,8 +11,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: phc2sys.service Source2: ptp4l.service -Patch0: linuxptp-aliasing.patch - BuildRequires: systemd-units Requires(post): systemd-units @@ -28,7 +26,6 @@ Supporting legacy APIs and other platforms is not a goal. %prep %setup -q -%patch0 -p 1 -b .aliasing %build make %{?_smp_mflags} \ @@ -90,6 +87,9 @@ fi %{_mandir}/man8/*.8* %changelog +* Mon Apr 22 2013 Miroslav Lichvar 1.2-1 +- update to 1.2 + * Mon Feb 18 2013 Miroslav Lichvar 1.1-1 - update to 1.1 - log phc2sys output diff --git a/sources b/sources index 5b086e3..d739171 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a04ed425dd4aaa458517f2d5fc9804cf linuxptp-1.1.tgz +b5e82a83d1dff895610bd809641ed7f6 linuxptp-1.2.tgz